[FFmpeg-devel] [PATCH 2/2] fftools: add -lavfi_dump option

[Nicolas George]

Signed-off-by: Nicolas George <george at nsup.org>
---
 doc/ffmpeg.texi         |  4 ++++
 fftools/ffmpeg.h        |  1 +
 fftools/ffmpeg_filter.c | 14 ++++++++++++++
 fftools/ffmpeg_opt.c    |  3 +++
 4 files changed, 22 insertions(+)


This will be useful for tests covering suble cases of the format
negotiation. I do not like to depend on libavdevice's lavfi, it is
clumsy.


diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index c896aede3b..e7341dda1d 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1834,6 +1834,10 @@ The default is the number of available CPUs.
 Define a complex filtergraph, i.e. one with arbitrary number of inputs and/or
 outputs. Equivalent to @option{-filter_complex}.
 
+ at anchor{lavfi_dump option}
+ at item -lavfi_dump (@emph{global})
+Dump the filter graphs and their negotiated formats to standard output.
+
 @item -filter_complex_script @var{filename} (@emph{global})
 This option is similar to @option{-filter_complex}, the only difference is that
 its argument is the name of the file from which a complex filtergraph
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index d2dd7ca092..42bf06e224 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -637,6 +637,7 @@ extern int filter_nbthreads;
 extern int filter_complex_nbthreads;
 extern int vstats_version;
 extern int auto_conversion_filters;
+extern int dump_filtergraphs;
 
 extern const AVIOInterruptCB int_cb;
 
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 49076f13ee..a35c93f587 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -1056,6 +1056,20 @@ int configure_filtergraph(FilterGraph *fg)
         avfilter_graph_set_auto_convert(fg->graph, AVFILTER_AUTO_CONVERT_NONE);
     if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0)
         goto fail;
+    if (dump_filtergraphs) {
+        char *dump = avfilter_graph_dump(fg->graph, "f=tech");
+        if (!dump)
+            return AVERROR(ENOMEM);
+        if (simple) {
+            OutputStream *ost = fg->outputs[0]->ost;
+            printf("Dump of filter graph for output #%d:%d:", ost->file_index, ost->index);
+        } else {
+            printf("Dump of complex filter graph #%d:", fg->index);
+        }
+        printf("\n\n%s\n", dump);
+        av_free(dump);
+        fflush(stdout);
+    }
 
     /* limit the lists of allowed formats to the ones selected, to
      * make sure they stay the same if the filtergraph is reconfigured later */
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 428934a3d8..7855ea8a32 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -173,6 +173,7 @@ int filter_nbthreads = 0;
 int filter_complex_nbthreads = 0;
 int vstats_version = 2;
 int auto_conversion_filters = 1;
+int dump_filtergraphs = 0;
 int64_t stats_period = 500000;
 
 
@@ -3632,6 +3633,8 @@ const OptionDef options[] = {
         "number of threads for -filter_complex" },
     { "lavfi",          HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_filter_complex },
         "create a complex filtergraph", "graph_description" },
+    { "lavfi_dump",     OPT_BOOL | OPT_EXPERT,                       { &dump_filtergraphs },
+        "dump filter graphs to standard output" },
     { "filter_complex_script", HAS_ARG | OPT_EXPERT,                 { .func_arg = opt_filter_complex_script },
         "read complex filtergraph description from a file", "filename" },
     { "auto_conversion_filters", OPT_BOOL | OPT_EXPERT,              { &auto_conversion_filters },
-- 
2.32.0