diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-03-07 17:55:23 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-03-07 17:55:23 +0000 |
| commit | 1e79771c310e3b22984f1cc989afd4434bfcc2c4 (patch) | |
| tree | 39b5099e8b8380567a42c4396912ab3181c16ff0 | |
| parent | 56540673410c5273c9b9590354ca21ae9fda639a (diff) | |
| download | ffmpeg-1e79771c310e3b22984f1cc989afd4434bfcc2c4.tar.gz | |
Add support for non-backwards compatible signaled parametric stereo.
This is done without breaking W6132 Annex YYYY draft MP3onMP4 which also uses AOT 29.
Samples:
http://samples.mplayerhq.hu/A-codecs/AAC/aacPlusDecoderCheckPackage_v2.1/bitstreams/File7.3gp
http://samples.mplayerhq.hu/MPEG-4/mp3on4/id5_1.mp4
Originally committed as revision 22281 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpeg4audio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 7fe25bd3d6..0666bbbc42 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -88,7 +88,9 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels)) c->channels = ff_mpeg4audio_channels[c->chan_config]; c->sbr = -1; - if (c->object_type == AOT_SBR) { + if (c->object_type == AOT_SBR || (c->object_type == AOT_PS && + // check for W6132 Annex YYYY draft MP3onMP4 + !(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) { c->ext_object_type = c->object_type; c->sbr = 1; c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index); |