summaryrefslogtreecommitdiffstats
path: root/demux/timeline.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-02-21 00:19:17 +0100
committerwm4 <wm4@nowhere>2020-02-21 00:19:17 +0100
commit6f0297dff497f219d6da3e09ecfe0fd545825d9c (patch)
treedb73f7bce99c45c33348e16905a97e48680f0417 /demux/timeline.h
parent6726b7a1ba5248e4edcab3dbd24c730551afb012 (diff)
downloadmpv-6f0297dff497f219d6da3e09ecfe0fd545825d9c.tar.bz2
mpv-6f0297dff497f219d6da3e09ecfe0fd545825d9c.tar.xz
edl: make it possible to delay-load files with multiple tracks
Until now, delay-loading was for files with single tracks only (basically what DASH and HLS like to expose, so adaptive streaming and codec selection becomes easier - for sites, not for us). But they also provide some interleaved versions, probably for compatibility. Until now, we were forced to eagerly load it (making startup slightly slower). But there is not much missing. We just need a way to provide multiple metadata entries, and use them to represent each track. A side effect is now that the "track_meta" header can be used for normal EDL files too.
Diffstat (limited to 'demux/timeline.h')
-rw-r--r--demux/timeline.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/demux/timeline.h b/demux/timeline.h
index faeec53b32..93919a5c51 100644
--- a/demux/timeline.h
+++ b/demux/timeline.h
@@ -24,9 +24,11 @@ struct timeline_par {
bstr init_fragment;
bool dash, no_clip, delay_open;
- // If non-NULL, _some_ fields are used. If delay_open==true, this must be
- // set, and the codec info is used.
- struct sh_stream *sh_meta;
+ // Of any of these, _some_ fields are used. If delay_open==true, this
+ // describes each sub-track, and the codec info is used.
+ // In both cases, the metadata is mapped to actual tracks in specific ways.
+ struct sh_stream **sh_meta;
+ int num_sh_meta;
// Segments to play, ordered by time.
struct timeline_part *parts;