Mercurial > libavcodec.hg
changeset 7585:12976f458c7a libavcodec
Synchronize AAC encoder with renamings in aac.h
| author | kostya |
|---|---|
| date | Sat, 16 Aug 2008 11:59:36 +0000 |
| parents | d8717018ac03 |
| children | 6082ce39f8eb |
| files | aacenc.c |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/aacenc.c Sat Aug 16 05:47:18 2008 +0000 +++ b/aacenc.c Sat Aug 16 11:59:36 2008 +0000 @@ -120,12 +120,12 @@ /** 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 @@ 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 @@ 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);