Backport all of the demux_opts changes.

Author: dancingmirrors

demux/demux.c

@@ -82,31 +82,6 @@ static const demuxer_desc_t *const demuxer_list[] = {
     NULL
 };
 
-/* XXX: Finish backporting upstream a343666ab5121e7a3388be9aa2d8731d6d1f2f64.
- * Update 73e72749f2899eab1a40049fcd27ccb271abf311 accordingly as well.
- */
-struct demux_opts {
-    int enable_cache;
-    bool disk_cache;
-    int64_t max_bytes;
-    int64_t max_bytes_bw;
-    bool donate_fw;
-    double min_secs;
-    double hyst_secs;
-    bool force_seekable;
-    double min_secs_cache;
-    bool access_references;
-    int seekable_cache;
-    bool create_ccs;
-    char *record_file;
-    int video_back_preroll;
-    int audio_back_preroll;
-    int back_batch[STREAM_TYPE_COUNT];
-    double back_seek_size;
-    char *meta_cp;
-    bool force_retry_eof;
-};
-
 #define OPT_BASE_STRUCT struct demux_opts
 
 static bool get_demux_sub_opts(int index, const struct m_sub_options **sub);
@@ -189,9 +164,6 @@ struct demux_internal {
 
     // -- All the following fields are protected by lock.
 
-    struct demux_opts *opts;
-    struct m_config_cache *opts_cache;
-
     bool thread_terminate;
     bool threading;
     bool shutdown_async;
@@ -1024,7 +996,7 @@ static void demux_add_sh_stream_locked(struct demux_internal *in,
 
     switch (ds->type) {
     case STREAM_AUDIO:
-        ds->back_preroll = in->opts->audio_back_preroll;
+        ds->back_preroll = in->d_thread->opts->audio_back_preroll;
         if (ds->back_preroll < 0) { // auto
             ds->back_preroll = mp_codec_is_lossless(sh->codec->codec) ? 0 : 1;
             if (sh->codec->codec && (strcmp(sh->codec->codec, "opus") == 0 ||
@@ -1034,7 +1006,7 @@ static void demux_add_sh_stream_locked(struct demux_internal *in,
         }
         break;
     case STREAM_VIDEO:
-        ds->back_preroll = in->opts->video_back_preroll;
+        ds->back_preroll = in->d_thread->opts->video_back_preroll;
         if (ds->back_preroll < 0)
             ds->back_preroll = 0; // auto
         break;
@@ -1464,7 +1436,7 @@ static void find_backward_restart_pos(struct demux_stream *ds)
 
     // Number of renderable keyframes to return to user.
     // (Excludes preroll, which is decoded by user, but then discarded.)
-    int batch = MPMAX(in->opts->back_batch[ds->type], 1);
+    int batch = MPMAX(in->d_thread->opts->back_batch[ds->type], 1);
     // Number of keyframes to return to the user in total.
     int total = batch + ds->back_preroll;
 
@@ -1576,7 +1548,7 @@ static void find_backward_restart_pos(struct demux_stream *ds)
             in->back_any_need_recheck = true;
             mp_cond_signal(&in->wakeup);
         } else {
-            ds->back_seek_pos -= in->opts->back_seek_size;
+            ds->back_seek_pos -= in->d_thread->opts->back_seek_size;
             in->need_back_seek = true;
         }
     }
@@ -1983,13 +1955,13 @@ static void record_packet(struct demux_internal *in, struct demux_packet *dp)
 {
     // (should preferably be outside of the lock)
     if (in->enable_recording && !in->recorder &&
-        in->opts->record_file && in->opts->record_file[0])
+        in->d_thread->opts->record_file && in->d_thread->opts->record_file[0])
     {
         // Later failures shouldn't make it retry and overwrite the previously
         // recorded file.
         in->enable_recording = false;
 
-        in->recorder = recorder_create(in, in->opts->record_file);
+        in->recorder = recorder_create(in, in->d_thread->opts->record_file);
         if (!in->recorder)
             MP_ERR(in, "Disabling recording.\n");
     }
@@ -2069,7 +2041,7 @@ static void add_packet_locked(struct sh_stream *stream, demux_packet_t *dp)
 
     record_packet(in, dp);
 
-    if (in->cache && in->opts->disk_cache && !dp->is_wrapped_avframe) {
+    if (in->cache && in->d_thread->opts->disk_cache && !dp->is_wrapped_avframe) {
         int64_t pos = demux_cache_write(in->cache, dp);
         if (pos >= 0) {
             demux_packet_unref_contents(dp);
@@ -2324,7 +2296,7 @@ static void prune_old_packets(struct demux_internal *in)
         uint64_t max_avail = in->max_bytes_bw;
         // Backward cache (if enabled at all) can use unused forward cache.
         // Still leave 1 byte free, so the read_packet logic doesn't get stuck.
-        if (max_avail && in->max_bytes > (fw_bytes + 1) && in->opts->donate_fw)
+        if (max_avail && in->max_bytes > (fw_bytes + 1) && in->d_thread->opts->donate_fw)
             max_avail += in->max_bytes - (fw_bytes + 1);
         if (in->total_bytes - fw_bytes <= max_avail)
             break;
@@ -2471,7 +2443,7 @@ static void execute_seek(struct demux_internal *in)
 
 static void update_opts(struct demux_internal *in)
 {
-    struct demux_opts *opts = in->opts;
+    struct demux_opts *opts = in->d_thread->opts;
 
     in->min_secs = opts->min_secs;
     in->hyst_secs = opts->hyst_secs;
@@ -2537,10 +2509,10 @@ static void update_opts(struct demux_internal *in)
 // Make demuxing progress. Return whether progress was made.
 static bool thread_work(struct demux_internal *in)
 {
-    struct demux_opts *opts = in->opts;
+    struct demux_opts *opts = in->d_thread->opts;
     int64_t old_max_bytes = opts->max_bytes;
     int64_t old_max_bytes_bw = opts->max_bytes_bw;
-    if (m_config_cache_update(in->opts_cache)) {
+    if (m_config_cache_update(in->d_thread->opts_cache)) {
         update_opts(in);
         if (opts->max_bytes + opts->max_bytes_bw < old_max_bytes + old_max_bytes_bw)
             demux_packet_pool_clear(in->packet_pool);
@@ -2668,7 +2640,7 @@ static int dequeue_packet(struct demux_stream *ds, double min_pts,
         return 1;
     }
 
-    if (!in->reading && (!in->eof || in->opts->force_retry_eof)) {
+    if (!in->reading && (!in->eof || in->d_thread->opts->force_retry_eof)) {
         in->reading = true; // enable demuxer thread prefetching
         mp_cond_signal(&in->wakeup);
     }
@@ -3319,6 +3291,8 @@ static struct demuxer *open_given_type(struct dmpv_global *global,
         .events = DEMUX_EVENT_ALL,
         .duration = -1,
         .depth = params ? params->depth : 0,
+        .opts = opts,
+        .opts_cache = opts_cache,
     };
 
     struct demux_internal *in = demuxer->in = talloc_ptrtype(demuxer, in);
@@ -3329,8 +3303,6 @@ static struct demuxer *open_given_type(struct dmpv_global *global,
         .stats = stats_ctx_create(in, global, "demuxer"),
         .can_cache = params && params->is_top_level,
         .can_record = params && params->stream_record,
-        .opts = opts,
-        .opts_cache = opts_cache,
         .d_thread = talloc(demuxer, struct demuxer),
         .d_user = demuxer,
         .after_seek = true, // (assumed identical to initial demuxer state)
@@ -4641,7 +4613,7 @@ static void demux_convert_tags_charset(struct demuxer *demuxer)
 {
     struct demux_internal *in = demuxer->in;
 
-    char *cp = in->opts->meta_cp;
+    char *cp = in->d_thread->opts->meta_cp;
     if (!cp || mp_charset_is_utf8(cp))
         return;
 

demux/demux.h

@@ -93,6 +93,29 @@ enum demux_event {
 struct demuxer;
 struct timeline;
 
+// Demuxer options (public for access from various parts of code)
+struct demux_opts {
+    int enable_cache;
+    bool disk_cache;
+    int64_t max_bytes;
+    int64_t max_bytes_bw;
+    bool donate_fw;
+    double min_secs;
+    double hyst_secs;
+    bool force_seekable;
+    double min_secs_cache;
+    bool access_references;
+    int seekable_cache;
+    bool create_ccs;
+    char *record_file;
+    int video_back_preroll;
+    int audio_back_preroll;
+    int back_batch[STREAM_TYPE_COUNT];
+    double back_seek_size;
+    char *meta_cp;
+    bool force_retry_eof;
+};
+
 /**
  * Demuxer description structure
  */
@@ -234,6 +257,10 @@ typedef struct demuxer {
     struct demux_packet_pool *packet_pool;
     struct demuxer_params *params;
 
+    // Demuxer options - public for access by demuxer implementations
+    struct demux_opts *opts;
+    struct m_config_cache *opts_cache;
+
     // internal to demux.c
     struct demux_internal *in;