From 0412cb67cda05b08dfca6bfc4ff664ea917fa932 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 11 Mar 2014 15:42:44 +0200 Subject: aacdec: Don't count probed ADTS frames if there are false positives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- libavformat/aacdec.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'libavformat/aacdec.c') diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index b9a4b4b120..f5d0c6948b 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -42,8 +42,16 @@ static int adts_aac_probe(AVProbeData *p) for (frames = 0; buf2 < end; frames++) { 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; + } fsize = (AV_RB32(buf2 + 3) >> 13) & 0x1FFF; if (fsize < 7) break; -- cgit v1.2.3