highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ext_object_type.

Browse Source 
In the case of explicit non-backwards compible PS, the extension object
type should be set to SBR. See 14496-3:2009 (fourth edition).

Originally committed as revision 22816 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2010-04-08 06:04:31 +00:00
parent 58f48adb51
commit 702b73bc9f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpeg4audio.c
View File

@ -91,7 +91,7 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
if (c->object_type == AOT_SBR || (c->object_type == AOT_PS && if (c->object_type == AOT_SBR || (c->object_type == AOT_PS &&
// check for W6132 Annex YYYY draft MP3onMP4 // check for W6132 Annex YYYY draft MP3onMP4
!(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) { !(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) {
c->ext_object_type = c->object_type; c->ext_object_type = AOT_SBR;
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);
c->object_type = get_object_type(&gb); c->object_type = get_object_type(&gb);