[FFmpeg-cvslog] r22818 - in trunk/libavcodec: mpeg4audio.c mpeg4audio.h

[alexc]

Author: alexc
Date: Thu Apr  8 08:04:41 2010
New Revision: 22818

Log:
Add support for PS sync extensions.

Modified:
   trunk/libavcodec/mpeg4audio.c
   trunk/libavcodec/mpeg4audio.h

Modified: trunk/libavcodec/mpeg4audio.c
==============================================================================
--- trunk/libavcodec/mpeg4audio.c	Thu Apr  8 08:04:37 2010	(r22817)
+++ trunk/libavcodec/mpeg4audio.c	Thu Apr  8 08:04:41 2010	(r22818)
@@ -88,9 +88,12 @@ 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;
+    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 @@ int ff_mpeg4audio_get_config(MPEG4AudioC
                 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

Modified: trunk/libavcodec/mpeg4audio.h
==============================================================================
--- trunk/libavcodec/mpeg4audio.h	Thu Apr  8 08:04:37 2010	(r22817)
+++ trunk/libavcodec/mpeg4audio.h	Thu Apr  8 08:04:41 2010	(r22818)
@@ -37,6 +37,7 @@ typedef struct {
     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];