[FFmpeg-devel] [PATCH 15/20] fftools/ffmpeg_mux_init: stop using OptionsContext as storage in copy_metadata()

[Anton Khirnov <anton@khirnov.net>]

It should be input-only to this code. Will allow making it const in
future commits.
---
 fftools/ffmpeg.h          |  3 ---
 fftools/ffmpeg_mux_init.c | 24 ++++++++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index a124b1b045..8a50cd8d4b 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -148,9 +148,6 @@ typedef struct OptionsContext {
     AudioChannelMap *audio_channel_maps; /* one info entry per -map_channel */
     int           nb_audio_channel_maps; /* number of (valid) -map_channel settings */
 #endif
-    int metadata_global_manual;
-    int metadata_streams_manual;
-    int metadata_chapters_manual;
     const char **attachments;
     int       nb_attachments;
 
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 9e0164ba19..96584e960b 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1443,7 +1443,10 @@ static int copy_chapters(InputFile *ifile, OutputFile *ofile, AVFormatContext *o
     return 0;
 }
 
-static int copy_metadata(const char *outspec, const char *inspec, AVFormatContext *oc, AVFormatContext *ic, OptionsContext *o)
+static int copy_metadata(const char *outspec, const char *inspec,
+                         AVFormatContext *oc, AVFormatContext *ic,
+                         int *metadata_global_manual, int *metadata_streams_manual,
+                         int *metadata_chapters_manual, OptionsContext *o)
 {
     AVDictionary **meta_in = NULL;
     AVDictionary **meta_out = NULL;
@@ -1456,11 +1459,11 @@ static int copy_metadata(const char *outspec, const char *inspec, AVFormatContex
     parse_meta_type(outspec, &type_out, &idx_out, &ostream_spec);
 
     if (type_in == 'g' || type_out == 'g')
-        o->metadata_global_manual = 1;
+        *metadata_global_manual = 1;
     if (type_in == 's' || type_out == 's')
-        o->metadata_streams_manual = 1;
+        *metadata_streams_manual = 1;
     if (type_in == 'c' || type_out == 'c')
-        o->metadata_chapters_manual = 1;
+        *metadata_chapters_manual = 1;
 
     /* ic is NULL when just disabling automatic mappings */
     if (!ic)
@@ -1528,6 +1531,9 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
     OutputFile      *of = &mux->of;
     AVFormatContext *oc = mux->fc;
     int chapters_input_file = o->chapters_input_file;
+    int metadata_global_manual   = 0;
+    int metadata_streams_manual  = 0;
+    int metadata_chapters_manual = 0;
 
     /* copy metadata */
     for (int i = 0; i < o->nb_metadata_map; i++) {
@@ -1540,7 +1546,9 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
         }
         copy_metadata(o->metadata_map[i].specifier, *p ? p + 1 : p, oc,
                       in_file_index >= 0 ?
-                      input_files[in_file_index]->ctx : NULL, o);
+                      input_files[in_file_index]->ctx : NULL,
+                      &metadata_global_manual, &metadata_streams_manual,
+                      &metadata_chapters_manual, o);
     }
 
     /* copy chapters */
@@ -1561,10 +1569,10 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
     }
     if (chapters_input_file >= 0)
         copy_chapters(input_files[chapters_input_file], of, oc,
-                      !o->metadata_chapters_manual);
+                      !metadata_chapters_manual);
 
     /* copy global metadata by default */
-    if (!o->metadata_global_manual && nb_input_files){
+    if (!metadata_global_manual && nb_input_files){
         av_dict_copy(&oc->metadata, input_files[0]->ctx->metadata,
                      AV_DICT_DONT_OVERWRITE);
         if(o->recording_time != INT64_MAX)
@@ -1574,7 +1582,7 @@ static void copy_meta(Muxer *mux, OptionsContext *o)
         av_dict_set(&oc->metadata, "product_name", NULL, 0);
         av_dict_set(&oc->metadata, "product_version", NULL, 0);
     }
-    if (!o->metadata_streams_manual)
+    if (!metadata_streams_manual)
         for (int i = 0; i < of->nb_streams; i++) {
             OutputStream *ost = of->streams[i];
             InputStream *ist;
-- 
2.35.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".