virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avformat/dv: consider a header match at byte 0 to count as detection of dv in probe

Browse Source 
This reduces the amount of data needed to identify dv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-09 17:31:35 +01:00
parent e624df5dc3
commit ef8f293472
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/dv.c
View File

@ -585,6 +585,7 @@ static int dv_probe(AVProbeData *p)
unsigned state, marker_pos = 0; unsigned state, marker_pos = 0;
int i; int i;
int matches = 0; int matches = 0;
int firstmatch = 0;
int secondary_matches = 0; int secondary_matches = 0;
if (p->buf_size < 5) if (p->buf_size < 5)
@ -597,8 +598,11 @@ static int dv_probe(AVProbeData *p)
// should appear around every 12000 bytes, at least 10 per frame // should appear around every 12000 bytes, at least 10 per frame
if ((state & 0xff07ff7f) == 0x1f07003f) { if ((state & 0xff07ff7f) == 0x1f07003f) {
secondary_matches++; secondary_matches++;
if ((state & 0xffffff7f) == 0x1f07003f) if ((state & 0xffffff7f) == 0x1f07003f) {
matches++; matches++;
if (!i)
firstmatch = 1;
}
} }
if (state == 0x003f0700 || state == 0xff3f0700) if (state == 0x003f0700 || state == 0xff3f0700)
marker_pos = i; marker_pos = i;
@ -608,7 +612,7 @@ static int dv_probe(AVProbeData *p)
} }
if (matches && p->buf_size / matches < 1024 * 1024) { if (matches && p->buf_size / matches < 1024 * 1024) {
if (matches > 4 || if (matches > 4 || firstmatch ||
(secondary_matches >= 10 && (secondary_matches >= 10 &&
p->buf_size / secondary_matches < 24000)) p->buf_size / secondary_matches < 24000))
// not max to avoid dv in mov to match // not max to avoid dv in mov to match