Mercurial > libavcodec.hg

comparison aacenc.c @ 7585:12976f458c7a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Synchronize AAC encoder with renamings in aac.h
author kostya
date Sat, 16 Aug 2008 11:59:36 +0000
parents d8717018ac03
children ab454e7f1c35
comparison
equal deleted inserted replaced
7584:d8717018ac03 7585:12976f458c7a
118 swb_size_128_16, swb_size_128_16, swb_size_128_8 118 swb_size_128_16, swb_size_128_16, swb_size_128_8
119 }; 119 };
120 120
121 /** default channel configurations */ 121 /** default channel configurations */
122 static const uint8_t aac_chan_configs[6][5] = { 122 static const uint8_t aac_chan_configs[6][5] = {
123 {1, ID_SCE}, // 1 channel - single channel element 123 {1, TYPE_SCE}, // 1 channel - single channel element
124 {1, ID_CPE}, // 2 channels - channel pair 124 {1, TYPE_CPE}, // 2 channels - channel pair
125 {2, ID_SCE, ID_CPE}, // 3 channels - center + stereo 125 {2, TYPE_SCE, TYPE_CPE}, // 3 channels - center + stereo
126 {3, ID_SCE, ID_CPE, ID_SCE}, // 4 channels - front center + stereo + back center 126 {3, TYPE_SCE, TYPE_CPE, TYPE_SCE}, // 4 channels - front center + stereo + back center
127 {3, ID_SCE, ID_CPE, ID_CPE}, // 5 channels - front center + stereo + back stereo 127 {3, TYPE_SCE, TYPE_CPE, TYPE_CPE}, // 5 channels - front center + stereo + back stereo
128 {4, ID_SCE, ID_CPE, ID_CPE, ID_LFE}, // 6 channels - front center + stereo + back stereo + LFE 128 {4, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_LFE}, // 6 channels - front center + stereo + back stereo + LFE
129 }; 129 };
130 130
131 /** 131 /**
132 * AAC encoder context 132 * AAC encoder context
133 */ 133 */
236 if(!pulse->num_pulse) return; 236 if(!pulse->num_pulse) return;
237 237
238 put_bits(&s->pb, 2, pulse->num_pulse - 1); 238 put_bits(&s->pb, 2, pulse->num_pulse - 1);
239 put_bits(&s->pb, 6, pulse->start); 239 put_bits(&s->pb, 6, pulse->start);
240 for(i = 0; i < pulse->num_pulse; i++){ 240 for(i = 0; i < pulse->num_pulse; i++){
241 put_bits(&s->pb, 5, pulse->offset[i]); 241 put_bits(&s->pb, 5, pulse->pos[i]);
242 put_bits(&s->pb, 4, pulse->amp[i]); 242 put_bits(&s->pb, 4, pulse->amp[i]);
243 } 243 }
244 } 244 }
245 245
246 /** 246 /**
273 static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s, const char *name) 273 static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s, const char *name)
274 { 274 {
275 int i, namelen, padbits; 275 int i, namelen, padbits;
276 276
277 namelen = strlen(name) + 2; 277 namelen = strlen(name) + 2;
278 put_bits(&s->pb, 3, ID_FIL); 278 put_bits(&s->pb, 3, TYPE_FIL);
279 put_bits(&s->pb, 4, FFMIN(namelen, 15)); 279 put_bits(&s->pb, 4, FFMIN(namelen, 15));
280 if(namelen >= 15) 280 if(namelen >= 15)
281 put_bits(&s->pb, 8, namelen - 16); 281 put_bits(&s->pb, 8, namelen - 16);
282 put_bits(&s->pb, 4, 0); //extension type - filler 282 put_bits(&s->pb, 4, 0); //extension type - filler
283 padbits = 8 - (put_bits_count(&s->pb) & 7); 283 padbits = 8 - (put_bits_count(&s->pb) & 7);