virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

aacdec: Don't count probed ADTS frames if there are false positives

Browse Source 
If a portion of the probe buffer seem to resemble ADTS frames,
but some data at the end is a mismatch, disregard the whole
probing attempt. If it actually is ADTS data, there shouldn't be
any mismatches within the sequential frame data.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2014-03-11 15:42:44 +02:00
parent a84c8af042
commit 0412cb67cd
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/aacdec.c
View File

@ -42,8 +42,16 @@ static int adts_aac_probe(AVProbeData *p)
for (frames = 0; buf2 < end; frames++) { for (frames = 0; buf2 < end; frames++) {
uint32_t header = AV_RB16(buf2); uint32_t header = AV_RB16(buf2);
if ((header & 0xFFF6) != 0xFFF0) if ((header & 0xFFF6) != 0xFFF0) {
if (buf != buf0) {
// Found something that isn't an ADTS header, starting
// from a position other than the start of the buffer.
// Discard the count we've accumulated so far since it
// probably was a false positive.
frames = 0;
}
break; break;
}
fsize = (AV_RB32(buf2 + 3) >> 13) & 0x1FFF; fsize = (AV_RB32(buf2 + 3) >> 13) & 0x1FFF;
if (fsize < 7) if (fsize < 7)
break; break;