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

demux: fix a corner case (2) 

It can happen that read_packet() doesn't read a packet, even if it
succeeds. Typically this is because a packet was read, but then thrown
away, because it's not part of a selected stream. The result would be a
bogus EOF condition.

Fix by explicitly checking for EOF.
This commit is contained in:
wm4 2014-07-19 12:34:07 +02:00
parent cfdb1312da
commit 887140b7d4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demux/demux.c
View File

@ -534,7 +534,8 @@ bool demux_stream_eof(struct sh_stream *sh)
struct demux_packet *demux_read_any_packet(struct demuxer *demuxer)
{
assert(!demuxer->in->threading); // doesn't work with threading
for (int retry = 0; retry < 2; retry++) {
bool read_more = true;
while (read_more) {
for (int n = 0; n < demuxer->num_streams; n++) {
struct sh_stream *sh = demuxer->streams[n];
sh->ds->active = sh->ds->selected; // force read_packet() to read
@ -544,7 +545,8 @@ struct demux_packet *demux_read_any_packet(struct demuxer *demuxer)
}
// retry after calling this
pthread_mutex_lock(&demuxer->in->lock);
read_packet(demuxer->in);
read_more = read_packet(demuxer->in);
read_more &= !demuxer->in->eof;
pthread_mutex_unlock(&demuxer->in->lock);
}
return NULL;