diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2007-02-09 02:02:09 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2007-02-09 02:02:09 +0000 |
| commit | f7a49547de2c26f858114d8fec634e6662389efb (patch) | |
| tree | 6f8164137d15aa16a0b110819c256d578ae4c93a /libavcodec | |
| parent | 7156aeb98a9e1171090d705c102fbcb227ac7311 (diff) | |
| download | ffmpeg-f7a49547de2c26f858114d8fec634e6662389efb.tar.gz | |
fix parsing of RealAudio AC-3/DolbyNet
Originally committed as revision 7888 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/parser.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 62a95c1a4a..1ef7339f19 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -657,7 +657,7 @@ static const int aac_channels[8] = { static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate, int *bit_rate, int *samples) { - unsigned int fscod, frmsizecod, acmod, bsid, lfeon; + unsigned int fscod, frmsizecod, acmod, bsid, lfeon, halfratecod; unsigned int strmtyp, substreamid, frmsiz, fscod2, numblkscod; GetBitContext bits; @@ -667,7 +667,7 @@ static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate, return 0; bsid = show_bits_long(&bits, 29) & 0x1f; - if(bsid <= 8) { /* Normal AC-3 */ + if(bsid <= 10) { /* Normal AC-3 */ skip_bits(&bits, 16); /* crc */ fscod = get_bits(&bits, 2); frmsizecod = get_bits(&bits, 6); @@ -686,13 +686,14 @@ static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate, skip_bits(&bits, 2); /* dsurmod */ lfeon = get_bits1(&bits); - *sample_rate = ac3_sample_rates[fscod]; - *bit_rate = ac3_bitrates[frmsizecod] * 1000; + halfratecod = FFMAX(bsid, 8) - 8; + *sample_rate = ac3_sample_rates[fscod] >> halfratecod; + *bit_rate = (ac3_bitrates[frmsizecod] * 1000) >> halfratecod; *channels = ac3_channels[acmod] + lfeon; *samples = 6 * 256; return ac3_frame_sizes[frmsizecod][fscod] * 2; - } else if (bsid >= 10 && bsid <= 16) { /* Enhanced AC-3 */ + } else if (bsid > 10 && bsid <= 16) { /* Enhanced AC-3 */ strmtyp = get_bits(&bits, 2); substreamid = get_bits(&bits, 3); |