[FFmpeg-devel] [PATCH 05/24] fftools/ffmpeg_filter: store just the link label in OutputFilter

[Anton Khirnov]

Not the entire AVFilterInOut. This is simpler.
---
 fftools/ffmpeg.h          | 6 ++++--
 fftools/ffmpeg_filter.c   | 8 +++++---
 fftools/ffmpeg_mux_init.c | 8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 1bb9125bf2..3aa19c7f5f 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -289,8 +289,10 @@ typedef struct OutputFilter {
     struct FilterGraph  *graph;
     uint8_t             *name;
 
-    /* temporary storage until stream maps are processed */
-    AVFilterInOut       *out_tmp;
+    /* for filters that are not yet bound to an output stream,
+     * this stores the output linklabel, if any */
+    uint8_t             *linklabel;
+
     enum AVMediaType     type;
 
     /* desired output stream properties */
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 75317139ba..323e63b829 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -324,7 +324,7 @@ void fg_free(FilterGraph **pfg)
     for (int j = 0; j < fg->nb_outputs; j++) {
         OutputFilter *ofilter = fg->outputs[j];
 
-        avfilter_inout_free(&ofilter->out_tmp);
+        av_freep(&ofilter->linklabel);
         av_freep(&ofilter->name);
         av_channel_layout_uninit(&ofilter->ch_layout);
         av_freep(&fg->outputs[j]);
@@ -661,16 +661,18 @@ int init_complex_filtergraph(FilterGraph *fg)
     for (cur = outputs; cur;) {
         OutputFilter *const ofilter = ofilter_alloc(fg);
 
-        ofilter->out_tmp = cur;
+        ofilter->linklabel = cur->name;
+        cur->name          = NULL;
+
         ofilter->type    = avfilter_pad_get_type(cur->filter_ctx->output_pads,
                                                                          cur->pad_idx);
         ofilter->name    = describe_filter_link(fg, cur, 0);
         cur = cur->next;
-        ofilter->out_tmp->next = NULL;
     }
 
 fail:
     avfilter_inout_free(&inputs);
+    avfilter_inout_free(&outputs);
     avfilter_graph_free(&graph);
     return ret;
 }
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 1c97804ec8..f7a24feec7 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1260,7 +1260,7 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o,
         if (ofilter) {
             ost->filter       = ofilter;
             ofilter->ost      = ost;
-            avfilter_inout_free(&ofilter->out_tmp);
+            av_freep(&ofilter->linklabel);
         } else {
             ret = init_simple_filtergraph(ost->ist, ost, filters);
             if (ret < 0) {
@@ -1451,8 +1451,8 @@ static void map_manual(Muxer *mux, const OptionsContext *o, const StreamMap *map
         for (j = 0; j < nb_filtergraphs; j++) {
             fg = filtergraphs[j];
             for (k = 0; k < fg->nb_outputs; k++) {
-                AVFilterInOut *out = fg->outputs[k]->out_tmp;
-                if (out && !strcmp(out->name, map->linklabel)) {
+                const char *linklabel = fg->outputs[k]->linklabel;
+                if (linklabel && !strcmp(linklabel, map->linklabel)) {
                     ofilter = fg->outputs[k];
                     goto loop_end;
                 }
@@ -1562,7 +1562,7 @@ static void create_streams(Muxer *mux, const OptionsContext *o)
         for (int j = 0; j < fg->nb_outputs; j++) {
             OutputFilter *ofilter = fg->outputs[j];
 
-            if (!ofilter->out_tmp || ofilter->out_tmp->name)
+            if (ofilter->linklabel || ofilter->ost)
                 continue;
 
             switch (ofilter->type) {
-- 
2.40.1