RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_mkv: fix image detection 

If blocks were already demuxed we would skip them and ask for new ones.
For files with few blocks it would return EOF without actually checking
the content.

Also make demux limit higher. In practice it doesn't matter, because if
it is image, video track will have only 1 block. And if it is not image
it will break on 2nd video block.

Fixes: #13975
This commit is contained in:
Kacper Michajłow 2024-05-05 14:13:14 +02:00
parent abe8f3f9df
commit 22ed5d0d3a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demux/demux_mkv.c
View File

@ -2044,14 +2044,14 @@ static void probe_if_image(demuxer_t *demuxer)
int64_t timecode = -1; int64_t timecode = -1;
// Arbitrary restriction on packet reading. // Arbitrary restriction on packet reading.
for (int i = 0; i < 1000; i++) { for (size_t block = 0; block < 100000; block++) {
int ret = read_next_block_into_queue(demuxer); if (block >= mkv_d->num_blocks && read_next_block_into_queue(demuxer) != 1)
if (ret == 1 && mkv_d->blocks[i].track == track) { break;
if (timecode != mkv_d->blocks[i].timecode) if (mkv_d->blocks[block].track != track)
continue;
if (timecode != mkv_d->blocks[block].timecode)
++video_blocks; ++video_blocks;
timecode = mkv_d->blocks[i].timecode; timecode = mkv_d->blocks[block].timecode;
}
// No need to read more
if (video_blocks > 1) if (video_blocks > 1)
break; break;
} }