diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-08-16 11:59:36 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-08-16 11:59:36 +0000 |
| commit | f5c3eae3cbdc97597d2390ab657e37cc84f15dda (patch) | |
| tree | 8773e0f147b95666316f6a5c9f14d37125c52259 /libavcodec/aacenc.c | |
| parent | 817015e4e2e8d9efbec446033341c9117f889bb8 (diff) | |
Synchronize AAC encoder with renamings in aac.h
Originally committed as revision 14786 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aacenc.c')
| -rw-r--r-- | libavcodec/aacenc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 838863b8b8..08016c95a5 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -120,12 +120,12 @@ static const uint8_t *swb_size_128[] = { /** default channel configurations */ static const uint8_t aac_chan_configs[6][5] = { - {1, ID_SCE}, // 1 channel - single channel element - {1, ID_CPE}, // 2 channels - channel pair - {2, ID_SCE, ID_CPE}, // 3 channels - center + stereo - {3, ID_SCE, ID_CPE, ID_SCE}, // 4 channels - front center + stereo + back center - {3, ID_SCE, ID_CPE, ID_CPE}, // 5 channels - front center + stereo + back stereo - {4, ID_SCE, ID_CPE, ID_CPE, ID_LFE}, // 6 channels - front center + stereo + back stereo + LFE + {1, TYPE_SCE}, // 1 channel - single channel element + {1, TYPE_CPE}, // 2 channels - channel pair + {2, TYPE_SCE, TYPE_CPE}, // 3 channels - center + stereo + {3, TYPE_SCE, TYPE_CPE, TYPE_SCE}, // 4 channels - front center + stereo + back center + {3, TYPE_SCE, TYPE_CPE, TYPE_CPE}, // 5 channels - front center + stereo + back stereo + {4, TYPE_SCE, TYPE_CPE, TYPE_CPE, TYPE_LFE}, // 6 channels - front center + stereo + back stereo + LFE }; /** @@ -238,7 +238,7 @@ static void encode_pulses(AVCodecContext *avctx, AACEncContext *s, Pulse *pulse, put_bits(&s->pb, 2, pulse->num_pulse - 1); put_bits(&s->pb, 6, pulse->start); for(i = 0; i < pulse->num_pulse; i++){ - put_bits(&s->pb, 5, pulse->offset[i]); + put_bits(&s->pb, 5, pulse->pos[i]); put_bits(&s->pb, 4, pulse->amp[i]); } } @@ -275,7 +275,7 @@ static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s, const ch int i, namelen, padbits; namelen = strlen(name) + 2; - put_bits(&s->pb, 3, ID_FIL); + put_bits(&s->pb, 3, TYPE_FIL); put_bits(&s->pb, 4, FFMIN(namelen, 15)); if(namelen >= 15) put_bits(&s->pb, 8, namelen - 16); |