summaryrefslogtreecommitdiffstats
path: root/demux/demux.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-09-20 17:01:35 +0200
committerwm4 <wm4@nowhere>2019-09-20 17:01:35 +0200
commit94bfe833559e5426d2c8b51db321f2b1dd28bd0e (patch)
tree7829b19b302b4914ffd9b38b3594be7b05150db3 /demux/demux.c
parent4fa8f33b92a44fe928817a81653f135402192cac (diff)
downloadmpv-94bfe833559e5426d2c8b51db321f2b1dd28bd0e.tar.bz2
mpv-94bfe833559e5426d2c8b51db321f2b1dd28bd0e.tar.xz
demux: propagate streaming flag through demux_timeline
Before this commit, EDL or CUE files did not properly enable the cache if they were on "slow" media (stream->streaming==true). This happened because the stream is unset for demux_timeline, so the streaming flag could not be queried anymore. Fix this by adding this flag to struct demuxer, and propagate it exactly like the is_network flag. is_network is not used for checking the cache options anymore, and its main function seems to be something else. Normal http streams set the streaming flag already. This should fix #6958.
Diffstat (limited to 'demux/demux.c')
-rw-r--r--demux/demux.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 4cefd1e0dc..2b1f7d5625 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -2385,8 +2385,7 @@ static void update_opts(struct demux_internal *in)
in->max_bytes_bw = opts->max_bytes_bw;
int seekable = opts->seekable_cache;
- bool is_streaming = in->d_thread->is_network ||
- (in->d_thread->stream && in->d_thread->stream->streaming);
+ bool is_streaming = in->d_thread->is_streaming;
bool use_cache = is_streaming;
if (opts->enable_cache >= 0)
use_cache = opts->enable_cache == 1;
@@ -2882,6 +2881,7 @@ static void demux_copy(struct demuxer *dst, struct demuxer *src)
dst->start_time = src->start_time;
dst->duration = src->duration;
dst->is_network = src->is_network;
+ dst->is_streaming = src->is_streaming;
dst->priv = src->priv;
dst->metadata = mp_tags_dup(dst, src->metadata);
}
@@ -3132,6 +3132,7 @@ bool demux_is_network_cached(demuxer_t *demuxer)
struct parent_stream_info {
bool seekable;
bool is_network;
+ bool is_streaming;
struct mp_cancel *cancel;
char *filename;
};
@@ -3162,6 +3163,7 @@ static struct demuxer *open_given_type(struct mpv_global *global,
.glog = log,
.filename = talloc_strdup(demuxer, sinfo->filename),
.is_network = sinfo->is_network,
+ .is_streaming = sinfo->is_streaming,
.access_references = opts->access_references,
.events = DEMUX_EVENT_ALL,
.duration = -1,
@@ -3290,6 +3292,7 @@ static struct demuxer *demux_open(struct stream *stream,
struct parent_stream_info sinfo = {
.seekable = stream->seekable,
.is_network = stream->is_network,
+ .is_streaming = stream->streaming,
.cancel = cancel,
.filename = talloc_strdup(NULL, stream->url),
};