1 files changed, 43 insertions, 13 deletions

diff --git a/demux/timeline.h b/demux/timeline.h
index 21a6602ba8..7bc7e9e053 100644
--- a/demux/timeline.h
+++ b/demux/timeline.h
@@ -1,38 +1,68 @@
 #ifndef MP_TIMELINE_H_
 #define MP_TIMELINE_H_
 
+#include "common/common.h"
+#include "misc/bstr.h"
+
+// Single segment in a timeline.
 struct timeline_part {
-    double start;
+    // (end time must match with start time of the next part)
+    double start, end;
     double source_start;
     char *url;
     struct demuxer *source;
 };
 
+// Timeline formed by a single demuxer. Multiple pars are used to get tracks
+// that require a separate opened demuxer, such as separate audio tracks. (For
+// example, for ordered chapters there is only a single par, because all streams
+// demux from the same file at a given time, while for DASH-style video+audio,
+// each track would have its own timeline.)
+// Note that demuxer instances must not be shared across timeline_pars. This
+// would conflict in demux_timeline.c.
+// "par" is short for parallel stream.
+struct timeline_par {
+    bstr init_fragment;
+    bool dash, no_clip, delay_open;
+
+    // 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;
+    int num_parts;
+
+    // Which source defines the overall track list (over the full timeline).
+    struct demuxer *track_layout;
+};
+
 struct timeline {
     struct mpv_global *global;
     struct mp_log *log;
     struct mp_cancel *cancel;
 
-    // main source
-    struct demuxer *demuxer;
+    bool is_network, is_streaming;
+    int stream_origin;
+    const char *format;
 
-    bstr init_fragment;
-    bool dash;
-
-    // All referenced files. The source file must be at sources[0].
+    // main source, and all other sources (this usually only has special meaning
+    // for memory management; mostly compensates for the lack of refcounting)
+    struct demuxer *demuxer;
     struct demuxer **sources;
     int num_sources;
 
-    // Segments to play, ordered by time. parts[num_parts] must be valid; its
-    // start field sets the duration, and source must be NULL.
-    struct timeline_part *parts;
-    int num_parts;
+    // Description of timeline ranges, possibly multiple parallel ones.
+    struct timeline_par **pars;
+    int num_pars;
 
     struct demux_chapter *chapters;
     int num_chapters;
 
-    // Which source defines the overall track list (over the full timeline).
-    struct demuxer *track_layout;
+    // global tags, attachments, editions
+    struct demuxer *meta;
 };
 
 struct timeline *timeline_load(struct mpv_global *global, struct mp_log *log,