RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 16:33:02 +00:00
Code Issues Releases Wiki Activity

demux_timeline: disable cache for inactive segments

Browse Source 
This is achieved indirectly by deslecting all streams for the non-
current segment (and if the segment doesn't share the demuxer with the
currently active one).

Restores functionality added with commit 46bcdb70.
This commit is contained in:
wm4 2016-02-16 21:05:18 +01:00
parent 0af5335383
commit 3c3cd0c540
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demux/demux_timeline.c
View File

@ -25,6 +25,8 @@
#include "timeline.h" #include "timeline.h"
#include "stheader.h" #include "stheader.h"
static void reselect_streams(struct demuxer *demuxer);
struct segment { struct segment {
int index; int index;
double start, end; double start, end;
@ -81,6 +83,7 @@ static void switch_segment(struct demuxer *demuxer, struct segment *new,
MP_VERBOSE(demuxer, "switch to segment %d\n", new->index); MP_VERBOSE(demuxer, "switch to segment %d\n", new->index);
p->current = new; p->current = new;
reselect_streams(demuxer);
demux_set_ts_offset(new->d, new->start - new->d_start); demux_set_ts_offset(new->d, new->start - new->d_start);
demux_seek(new->d, start_pts, flags | SEEK_ABSOLUTE); demux_seek(new->d, start_pts, flags | SEEK_ABSOLUTE);
@ -333,6 +336,8 @@ static int d_open(struct demuxer *demuxer, enum demux_check check)
demuxer->seekable = true; demuxer->seekable = true;
demuxer->partially_seekable = true; demuxer->partially_seekable = true;
reselect_streams(demuxer);
return 0; return 0;
} }
@ -360,6 +365,9 @@ static void reselect_streams(struct demuxer *demuxer)
bool selected = false; bool selected = false;
if (seg->stream_map[i] >= 0) if (seg->stream_map[i] >= 0)
selected = p->streams[seg->stream_map[i]].selected; selected = p->streams[seg->stream_map[i]].selected;
// This stops demuxer readahead for inactive segments.
if (!p->current || seg->d != p->current->d)
selected = false;
demuxer_select_track(seg->d, sh, selected); demuxer_select_track(seg->d, sh, selected);
} }
} }