demux_mkv: move global options to the demuxer

The options don't change, but they're now declared and used privately by
demux_mkv.c. This also brings with it a minor refactor of the subpreroll
seek handling - merge the code from playloop.c into demux_mkv.c. The
change in demux.c is pretty much equivalent as well.

demux/demux.c

@@ -499,7 +499,7 @@ static void start_refreshing(struct demux_internal *in)
 
     // Seek back to player's current position, with a small offset added.
     in->d_thread->desc->seek(in->d_thread, start_ts - 1.0,
-                             SEEK_ABSOLUTE | SEEK_BACKWARD | SEEK_SUBPREROLL);
+                             SEEK_ABSOLUTE | SEEK_BACKWARD | SEEK_HR);
 
     pthread_mutex_lock(&in->lock);
 }

demux/demux.h

@@ -67,7 +67,6 @@ struct demux_ctrl_stream_ctrl {
 #define SEEK_FACTOR   (1 << 1)      // argument is in range [0,1]
 #define SEEK_FORWARD  (1 << 2)      // prefer later time if not exact
 #define SEEK_BACKWARD (1 << 3)      // prefer earlier time if not exact
-#define SEEK_SUBPREROLL (1 << 4)    // try to get more subtitle packets
 #define SEEK_HR       (1 << 5)      // hr-seek (this is a weak hint only)
 
 // Strictness of the demuxer open format check.

demux/demux_mkv.c

@@ -43,6 +43,7 @@
 #include "talloc.h"
 #include "common/av_common.h"
 #include "options/options.h"
+#include "options/m_option.h"
 #include "misc/bstr.h"
 #include "stream/stream.h"
 #include "video/csputils.h"
@@ -184,6 +185,27 @@ typedef struct mkv_demuxer {
     bool eof_warning;
 } mkv_demuxer_t;
 
+#define OPT_BASE_STRUCT struct demux_mkv_opts
+struct demux_mkv_opts {
+    int subtitle_preroll;
+    double subtitle_preroll_secs;
+    int probe_duration;
+};
+
+const struct m_sub_options demux_mkv_conf = {
+    .opts = (const m_option_t[]) {
+        OPT_FLAG("subtitle-preroll", subtitle_preroll, 0),
+        OPT_DOUBLE("subtitle-preroll-secs", subtitle_preroll_secs,
+                   M_OPT_MIN, .min = 0),
+        OPT_FLAG("probe-video-duration", probe_duration, 0),
+        {0}
+    },
+    .size = sizeof(struct demux_mkv_opts),
+    .defaults = &(const struct demux_mkv_opts){
+        .subtitle_preroll_secs = 1.0,
+    },
+};
+
 #define REALHEADER_SIZE    16
 #define RVPROPERTIES_SIZE  34
 #define RAPROPERTIES4_SIZE 56
@@ -1751,6 +1773,7 @@ static int read_mkv_segment_header(demuxer_t *demuxer, int64_t *segment_end)
 static int demux_mkv_open(demuxer_t *demuxer, enum demux_check check)
 {
     stream_t *s = demuxer->stream;
+    struct MPOpts *opts = demuxer->opts;
     mkv_demuxer_t *mkv_d;
     int64_t start_pos;
     int64_t end_pos;
@@ -1836,7 +1859,7 @@ static int demux_mkv_open(demuxer_t *demuxer, enum demux_check check)
     add_coverart(demuxer);
     demuxer->allow_refresh_seeks = true;
 
-    if (demuxer->opts->mkv_probe_duration)
+    if (opts->demux_mkv->probe_duration)
         probe_last_timestamp(demuxer);
 
     return 0;
@@ -2619,9 +2642,12 @@ static int create_index_until(struct demuxer *demuxer, uint64_t timecode)
     return 0;
 }
 
+#define FLAG_BACKWARD 1
+#define FLAG_SUBPREROLL 2
 static struct mkv_index *seek_with_cues(struct demuxer *demuxer, int seek_id,
                                         int64_t target_timecode, int flags)
 {
+    struct MPOpts *opts = demuxer->opts;
     struct mkv_demuxer *mkv_d = demuxer->priv;
     struct mkv_index *index = NULL;
 
@@ -2631,7 +2657,7 @@ static struct mkv_index *seek_with_cues(struct demuxer *demuxer, int seek_id,
             int64_t diff =
                 target_timecode -
                 (int64_t) (mkv_d->indexes[i].timecode * mkv_d->tc_scale);
-            if (flags & SEEK_BACKWARD)
+            if (flags & FLAG_BACKWARD)
                 diff = -diff;
             if (min_diff != INT64_MIN) {
                 if (diff <= 0) {
@@ -2647,10 +2673,10 @@ static struct mkv_index *seek_with_cues(struct demuxer *demuxer, int seek_id,
 
     if (index) {        /* We've found an entry. */
         uint64_t seek_pos = index->filepos;
-        if (flags & SEEK_SUBPREROLL) {
+        if (flags & FLAG_SUBPREROLL) {
             // Find the cluster with the highest filepos, that has a timestamp
             // still lower than min_tc.
-            double secs = demuxer->opts->mkv_subtitle_preroll_secs;
+            double secs = opts->demux_mkv->subtitle_preroll_secs;
             uint64_t pre = MPMIN(INT64_MAX, secs * 1e9 / mkv_d->tc_scale);
             uint64_t min_tc = pre < index->timecode ? index->timecode - pre : 0;
             uint64_t prev_target = 0;
@@ -2709,9 +2735,13 @@ static void demux_mkv_seek(demuxer_t *demuxer, double rel_seek_secs, int flags)
                 a_tnum = track->tnum;
         }
     }
+
+    int cueflags = (flags & SEEK_BACKWARD) ? FLAG_BACKWARD : 0;
+
     mkv_d->subtitle_preroll = NUM_SUB_PREROLL_PACKETS;
-    if (!st_active[STREAM_SUB] || !st_active[STREAM_VIDEO])
-        flags &= ~SEEK_SUBPREROLL;
+    if (((flags & SEEK_HR) || demuxer->opts->demux_mkv->subtitle_preroll) &&
+        st_active[STREAM_SUB] && st_active[STREAM_VIDEO])
+        cueflags |= FLAG_SUBPREROLL;
 
     // Adjust the target a little bit to catch cases where the target position
     // specifies a keyframe with high, but not perfect, precision.
@@ -2727,9 +2757,9 @@ static void demux_mkv_seek(demuxer_t *demuxer, double rel_seek_secs, int flags)
 
         if (create_index_until(demuxer, target_timecode) >= 0) {
             int seek_id = st_active[STREAM_VIDEO] ? v_tnum : a_tnum;
-            index = seek_with_cues(demuxer, seek_id, target_timecode, flags);
+            index = seek_with_cues(demuxer, seek_id, target_timecode, cueflags);
             if (!index)
-                index = seek_with_cues(demuxer, -1, target_timecode, flags);
+                index = seek_with_cues(demuxer, -1, target_timecode, cueflags);
         }
 
         if (!index)

options/options.c

@@ -67,6 +67,7 @@ extern const struct m_sub_options sws_conf;
 extern const struct m_sub_options demux_rawaudio_conf;
 extern const struct m_sub_options demux_rawvideo_conf;
 extern const struct m_sub_options demux_lavf_conf;
+extern const struct m_sub_options demux_mkv_conf;
 extern const struct m_sub_options vd_lavc_conf;
 extern const struct m_sub_options ad_lavc_conf;
 extern const struct m_sub_options input_config;
@@ -311,11 +312,7 @@ const m_option_t mp_opts[] = {
     OPT_SUBSTRUCT("demuxer-lavf", demux_lavf, demux_lavf_conf, 0),
     OPT_SUBSTRUCT("demuxer-rawaudio", demux_rawaudio, demux_rawaudio_conf, 0),
     OPT_SUBSTRUCT("demuxer-rawvideo", demux_rawvideo, demux_rawvideo_conf, 0),
-
-    OPT_FLAG("demuxer-mkv-subtitle-preroll", mkv_subtitle_preroll, 0),
-    OPT_DOUBLE("demuxer-mkv-subtitle-preroll-secs", mkv_subtitle_preroll_secs,
-               M_OPT_MIN, .min = 0),
-    OPT_FLAG("demuxer-mkv-probe-video-duration", mkv_probe_duration, 0),
+    OPT_SUBSTRUCT("demuxer-mkv", demux_mkv, demux_mkv_conf, 0),
 
 // ------------------------- subtitles options --------------------
 
@@ -764,7 +761,6 @@ const struct MPOpts mp_default_opts = {
     .use_embedded_fonts = 1,
     .sub_fix_timing = 1,
     .sub_cp = "auto",
-    .mkv_subtitle_preroll_secs = 1.0,
     .screenshot_template = "shot%n",
 
     .hwdec_codecs = "h264,vc1,wmv3",

options/options.h

@@ -199,9 +199,6 @@ typedef struct MPOpts {
     double demuxer_min_secs;
     char *audio_demuxer_name;
     char *sub_demuxer_name;
-    int mkv_subtitle_preroll;
-    double mkv_subtitle_preroll_secs;
-    int mkv_probe_duration;
 
     double demuxer_min_secs_cache;
     int cache_pausing;
@@ -294,6 +291,7 @@ typedef struct MPOpts {
     struct demux_rawaudio_opts *demux_rawaudio;
     struct demux_rawvideo_opts *demux_rawvideo;
     struct demux_lavf_opts *demux_lavf;
+    struct demux_mkv_opts *demux_mkv;
 
     struct vd_lavc_params *vd_lavc_params;
     struct ad_lavc_params *ad_lavc_params;

player/playloop.c

@@ -240,8 +240,6 @@ static int mp_seek(MPContext *mpctx, struct seek_params seek,
     }
     if (hr_seek)
         demuxer_style |= SEEK_HR;
-    if (hr_seek || opts->mkv_subtitle_preroll)
-        demuxer_style |= SEEK_SUBPREROLL;
 
     if (hr_seek)
         demuxer_amount -= hr_seek_offset;