RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 10:11:01 +00:00
Code Issues Projects Releases Wiki Activity

fix probing and demuxing of pond.dv, issue #887

Browse Source 
Originally committed as revision 19197 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-06-15 01:41:59 +00:00
parent d310d56a36
commit 7060667580
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/dv.c
View File

@ -400,7 +400,7 @@ typedef struct RawDVContext {
static int dv_read_header(AVFormatContext *s, static int dv_read_header(AVFormatContext *s,
AVFormatParameters *ap) AVFormatParameters *ap)
{ {
unsigned state; unsigned state, marker_pos = 0;
RawDVContext *c = s->priv_data; RawDVContext *c = s->priv_data;
c->dv_demux = dv_init_demux(s); c->dv_demux = dv_init_demux(s);
@ -413,6 +413,13 @@ static int dv_read_header(AVFormatContext *s,
av_log(s, AV_LOG_ERROR, "Cannot find DV header.\n"); av_log(s, AV_LOG_ERROR, "Cannot find DV header.\n");
return -1; return -1;
} }
if (state == 0x003f0700 || state == 0xff3f0700)
marker_pos = url_ftell(s->pb);
if (state == 0xff3f0701 && url_ftell(s->pb) - marker_pos == 80) {
url_fseek(s->pb, -163, SEEK_CUR);
state = get_be32(s->pb);
break;
}
state = (state << 8) | get_byte(s->pb); state = (state << 8) | get_byte(s->pb);
} }
AV_WB32(c->buf, state); AV_WB32(c->buf, state);
@ -476,7 +483,7 @@ static int dv_read_close(AVFormatContext *s)
static int dv_probe(AVProbeData *p) static int dv_probe(AVProbeData *p)
{ {
unsigned state; unsigned state, marker_pos = 0;
int i; int i;
if (p->buf_size < 5) if (p->buf_size < 5)
@ -486,6 +493,10 @@ static int dv_probe(AVProbeData *p)
for (i = 4; i < p->buf_size; i++) { for (i = 4; i < p->buf_size; i++) {
if ((state & 0xffffff7f) == 0x1f07003f) if ((state & 0xffffff7f) == 0x1f07003f)
return AVPROBE_SCORE_MAX*3/4; // not max to avoid dv in mov to match return AVPROBE_SCORE_MAX*3/4; // not max to avoid dv in mov to match
if (state == 0x003f0700 || state == 0xff3f0700)
marker_pos = i;
if (state == 0xff3f0701 && i - marker_pos == 80)
return AVPROBE_SCORE_MAX/4;
state = (state << 8) | p->buf[i]; state = (state << 8) | p->buf[i];
} }