diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-04-08 06:04:41 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-04-08 06:04:41 +0000 |
| commit | d14662f66a4a9cfd1eadfa3b88e0be93e67d6524 (patch) | |
| tree | 5dea147c2a6299e47ba1c7a1c878af3acb89aa82 /libavcodec/mpeg4audio.c | |
| parent | 37216b99e090a88d98be57a8aab14a8316b96a71 (diff) | |
Add support for PS sync extensions.
Originally committed as revision 22818 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg4audio.c')
| -rw-r--r-- | libavcodec/mpeg4audio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 7b5333d1c6..7507212c76 100644 --- 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 |