Add support for PS sync extensions.

Originally committed as revision 22818 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index 7b5333d1c660f43ab0c9ae28f4b774cc1994c72e..7507212c7670eb0df513810497877bc8ab881351 100644 (file)
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -88,9 +88,12 @@ 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;
+    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(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
                 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

diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index 69b1b732a2a206b9c1e0d7d7b19733541140480a..b94185079d5051a69423c07a51617543500c71a3 100644 (file)
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -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];