summaryrefslogtreecommitdiff
path: root/chromium/third_party/ffmpeg/libavformat/dtsdec.c
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/ffmpeg/libavformat/dtsdec.c')
-rw-r--r--chromium/third_party/ffmpeg/libavformat/dtsdec.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/chromium/third_party/ffmpeg/libavformat/dtsdec.c b/chromium/third_party/ffmpeg/libavformat/dtsdec.c
index 5c05758327f..23cbe93516a 100644
--- a/chromium/third_party/ffmpeg/libavformat/dtsdec.c
+++ b/chromium/third_party/ffmpeg/libavformat/dtsdec.c
@@ -34,6 +34,7 @@ static int dts_probe(AVProbeData *p)
uint32_t state = -1;
int markers[3] = {0};
int sum, max;
+ int64_t diff = 0;
buf = p->buf;
@@ -54,13 +55,17 @@ static int dts_probe(AVProbeData *p)
if (state == DCA_MARKER_14B_LE)
if ((bytestream_get_be16(&bufp) & 0xF0FF) == 0xF007)
markers[2]++;
+
+ if (buf - p->buf >= 4)
+ diff += FFABS(AV_RL16(buf) - AV_RL16(buf-4));
}
sum = markers[0] + markers[1] + markers[2];
max = markers[1] > markers[0];
max = markers[2] > markers[max] ? 2 : max;
if (markers[max] > 3 && p->buf_size / markers[max] < 32*1024 &&
- markers[max] * 4 > sum * 3)
- return AVPROBE_SCORE_MAX/2+1;
+ markers[max] * 4 > sum * 3 &&
+ diff / p->buf_size > 200)
+ return AVPROBE_SCORE_EXTENSION + 1;
return 0;
}