Mercurial > libavcodec.hg

changeset 11588:480a999ce2c4 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for PS sync extensions.
author alexc
date Thu, 08 Apr 2010 06:04:41 +0000
parents d80d54dd267d
children fa81ba4670ea
files mpeg4audio.c mpeg4audio.h
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg4audio.c	Thu Apr 08 06:04:37 2010 +0000
+++ b/mpeg4audio.c	Thu Apr 08 06:04:41 2010 +0000
@@ -88,9 +88,12 @@
     if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
         c->channels = ff_mpeg4audio_channels[c->chan_config];
     c->sbr = -1;
+    c->ps  = -1;
     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)))) {
+        if (c->object_type == AOT_PS)
+            c->ps = 1;
         c->ext_object_type = AOT_SBR;
         c->sbr = 1;
         c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
@@ -121,6 +124,8 @@
                 c->ext_object_type = get_object_type(&gb);
                 if (c->ext_object_type == AOT_SBR && (c->sbr = get_bits1(&gb)) == 1)
                     c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
+                if (get_bits_left(&gb) > 11 && get_bits(&gb, 11) == 0x548)
+                    c->ps = get_bits1(&gb);
                 break;
             } else
                 get_bits1(&gb); // skip 1 bit
--- a/mpeg4audio.h	Thu Apr 08 06:04:37 2010 +0000
+++ b/mpeg4audio.h	Thu Apr 08 06:04:41 2010 +0000
@@ -37,6 +37,7 @@
     int ext_sample_rate;
     int ext_chan_config;
     int channels;
+    int ps;  //< -1 implicit, 1 presence
 } MPEG4AudioConfig;
 
 extern const int ff_mpeg4audio_sample_rates[16];