har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aacdec: detect faac and skip correct amount of startup samples

Browse Source 
This also fixes aac in adts and other containers than mov.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-28 20:03:50 +02:00
parent ed2b69a4c3
commit bfe735b582
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/aacdec.c
View File

@ -1947,6 +1947,32 @@ static int decode_dynamic_range(DynamicRangeControl *che_drc,
return n; return n;
} }
static int decode_fill(AACContext *ac, GetBitContext *gb, int len) {
uint8_t buf[256];
int i, major, minor;
if (len < 13+7*8)
goto unknown;
get_bits(gb, 13); len -= 13;
for(i=0; i+1<sizeof(buf) && len>=8; i++, len-=8)
buf[i] = get_bits(gb, 8);
buf[i] = 0;
if (ac->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(ac->avctx, AV_LOG_DEBUG, "FILL:%s\n", buf);
if (sscanf(buf, "libfaac %d.%d", &major, &minor) == 2){
ac->avctx->internal->skip_samples = 1024;
}
unknown:
skip_bits_long(gb, len);
return 0;
}
/** /**
* Decode extension data (incomplete); reference: table 4.51. * Decode extension data (incomplete); reference: table 4.51.
* *
@ -1988,6 +2014,8 @@ static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt,
res = decode_dynamic_range(&ac->che_drc, gb, cnt); res = decode_dynamic_range(&ac->che_drc, gb, cnt);
break; break;
case EXT_FILL: case EXT_FILL:
decode_fill(ac, gb, 8 * cnt - 4);
break;
case EXT_FILL_DATA: case EXT_FILL_DATA:
case EXT_DATA_ELEMENT: case EXT_DATA_ELEMENT:
default: default: