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

avformat/dtsdec: Improve probe, reject things looking like analog signals

Browse Source 
Fixes Ticket2810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6663205338f57eedb2392263dde48e2717c6e980)

Conflicts:
	libavformat/dtsdec.c
This commit is contained in:
Michael Niedermayer 2013-07-26 04:09:30 +02:00 committed by Carl Eugen Hoyos
parent 70127070dd
commit 875649bfae
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/dtsdec.c
View File

@ -34,6 +34,7 @@ static int dts_probe(AVProbeData *p)
uint32_t state = -1; uint32_t state = -1;
int markers[3] = {0}; int markers[3] = {0};
int sum, max; int sum, max;
int64_t diff = 0;
buf = p->buf; buf = p->buf;
@ -54,12 +55,16 @@ static int dts_probe(AVProbeData *p)
if (state == DCA_MARKER_14B_LE) if (state == DCA_MARKER_14B_LE)
if ((bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007) if ((bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007)
markers[2]++; markers[2]++;
if (buf - p->buf >= 4)
diff += FFABS(AV_RL16(buf) - AV_RL16(buf-4));
} }
sum = markers[0] + markers[1] + markers[2]; sum = markers[0] + markers[1] + markers[2];
max = markers[1] > markers[0]; max = markers[1] > markers[0];
max = markers[2] > markers[max] ? 2 : max; max = markers[2] > markers[max] ? 2 : max;
if (markers[max] > 3 && p->buf_size / markers[max] < 32*1024 && if (markers[max] > 3 && p->buf_size / markers[max] < 32*1024 &&
markers[max] * 4 > sum * 3) markers[max] * 4 > sum * 3 &&
diff / p->buf_size > 200)
return AVPROBE_SCORE_MAX/2+1; return AVPROBE_SCORE_MAX/2+1;
return 0; return 0;