Commit 0fe8cb81 authored by alexc's avatar alexc

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22281 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 2d8f818c
...@@ -88,7 +88,9 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si ...@@ -88,7 +88,9 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels)) if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
c->channels = ff_mpeg4audio_channels[c->chan_config]; c->channels = ff_mpeg4audio_channels[c->chan_config];
c->sbr = -1; 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->ext_object_type = c->object_type;
c->sbr = 1; c->sbr = 1;
c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index); c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment