[FFmpeg-cvslog] r22281 - trunk/libavcodec/mpeg4audio.c

[alexc]

Author: alexc
Date: Sun Mar  7 18:55:23 2010
New Revision: 22281

Log:
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

Modified:
   trunk/libavcodec/mpeg4audio.c

Modified: trunk/libavcodec/mpeg4audio.c
==============================================================================
--- trunk/libavcodec/mpeg4audio.c	Sun Mar  7 16:46:22 2010	(r22280)
+++ trunk/libavcodec/mpeg4audio.c	Sun Mar  7 18:55:23 2010	(r22281)
@@ -88,7 +88,9 @@ int ff_mpeg4audio_get_config(MPEG4AudioC
     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);