github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:36:24 +01:00
Code Releases Activity

Make AVI demuxer more resilient against broken or incomplete files.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28224 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-01-01 11:39:47 +00:00
parent 2641f96246
commit 12b1fea30f
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libmpdemux/demux_avi.c
View File

@ -158,6 +158,9 @@ static int demux_avi_read_packet(demuxer_t *demux,demux_stream_t *ds,unsigned in
ds_read_packet(ds,demux->stream,len,pts,idxpos,flags); ds_read_packet(ds,demux->stream,len,pts,idxpos,flags);
skip-=len; skip-=len;
} }
skip = FFMAX(skip, 0);
if (avi_stream_id(id) > 99 && id != mmioFOURCC('J','U','N','K'))
skip = FFMIN(skip, 65536);
if(skip){ if(skip){
mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Skipping %d bytes from packet %04X\n",skip,id); mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Skipping %d bytes from packet %04X\n",skip,id);
stream_skip(demux->stream,skip); stream_skip(demux->stream,skip);
@ -165,6 +168,18 @@ static int demux_avi_read_packet(demuxer_t *demux,demux_stream_t *ds,unsigned in
return ds?1:0; return ds?1:0;
} }
static uint32_t avi_find_id(stream_t *stream) {
uint32_t id = stream_read_dword_le(stream);
if (!id) {
mp_msg(MSGT_DEMUX, MSGL_WARN, "Incomplete stream? Trying resync.\n");
do {
id = stream_read_dword_le(stream);
if (stream_eof(stream)) return 0;
} while (avi_stream_id(id) > 99);
}
return id;
}
// return value: // return value:
// 0 = EOF or no stream found // 0 = EOF or no stream found
// 1 = successfully read a packet // 1 = successfully read a packet
@ -222,7 +237,7 @@ do{
demux->stream->eof=1; demux->stream->eof=1;
return 0; return 0;
} }
id=stream_read_dword_le(demux->stream); id=avi_find_id(demux->stream);
len=stream_read_dword_le(demux->stream); len=stream_read_dword_le(demux->stream);
if(stream_eof(demux->stream)) return 0; // EOF! if(stream_eof(demux->stream)) return 0; // EOF!
@ -347,7 +362,7 @@ do{
return 0; return 0;
} }
id=stream_read_dword_le(demux->stream); id=avi_find_id(demux->stream);
len=stream_read_dword_le(demux->stream); len=stream_read_dword_le(demux->stream);
if(stream_eof(demux->stream)) return 0; if(stream_eof(demux->stream)) return 0;