Mercurial > libavcodec.hg

changeset 11387:c7ed26e2011f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author alexc
date Sun, 07 Mar 2010 17:55:23 +0000
parents 0262869c11a9
children 404629a45da1
files mpeg4audio.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg4audio.c	Sun Mar 07 12:12:42 2010 +0000
+++ b/mpeg4audio.c	Sun Mar 07 17:55:23 2010 +0000
@@ -88,7 +88,9 @@
     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);