[FFmpeg-cvslog] fftools/ffmpeg: stop setting InputStream fields from muxing/filtering code

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Apr 11 13:05:46 2023 +0200| [ff92ecad2fca6143637538fb7ab3423205ebb4a7] | committer: Anton Khirnov

fftools/ffmpeg: stop setting InputStream fields from muxing/filtering code

Set InputStream.decoding_needed/discard/etc. only from
ist_{filter,output},add() functions. Reduces the knowledge of
InputStream internals in muxing/filtering code.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff92ecad2fca6143637538fb7ab3423205ebb4a7
---

 fftools/ffmpeg.h          |  2 +-
 fftools/ffmpeg_demux.c    | 13 ++++++++++++-
 fftools/ffmpeg_filter.c   |  8 ++------
 fftools/ffmpeg_mux_init.c |  6 ------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index d25377514e..c73fc8a459 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -880,7 +880,7 @@ void ifile_close(InputFile **f);
 int ifile_get_packet(InputFile *f, AVPacket **pkt);
 
 void ist_output_add(InputStream *ist, OutputStream *ost);
-void ist_filter_add(InputStream *ist, InputFilter *ifilter);
+void ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple);
 
 /* iterate over all input streams in all input files;
  * pass NULL to start iteration */
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 6f68c7f6b5..c7141abadf 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -561,14 +561,25 @@ void ifile_close(InputFile **pf)
     av_freep(pf);
 }
 
+static void ist_use(InputStream *ist, int decoding_needed)
+{
+    ist->discard          = 0;
+    ist->st->discard      = ist->user_set_discard;
+    ist->decoding_needed |= decoding_needed;
+}
+
 void ist_output_add(InputStream *ist, OutputStream *ost)
 {
+    ist_use(ist, ost->enc ? DECODING_FOR_OST : 0);
+
     GROW_ARRAY(ist->outputs, ist->nb_outputs);
     ist->outputs[ist->nb_outputs - 1] = ost;
 }
 
-void ist_filter_add(InputStream *ist, InputFilter *ifilter)
+void ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple)
 {
+    ist_use(ist, is_simple ? DECODING_FOR_OST : DECODING_FOR_FILTER);
+
     GROW_ARRAY(ist->filters, ist->nb_filters);
     ist->filters[ist->nb_filters - 1] = ifilter;
 }
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index d2a185cf98..1d88d2e3b1 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -215,7 +215,7 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost)
     GROW_ARRAY(filtergraphs, nb_filtergraphs);
     filtergraphs[nb_filtergraphs - 1] = fg;
 
-    ist_filter_add(ist, ifilter);
+    ist_filter_add(ist, ifilter, 1);
 
     return 0;
 }
@@ -303,10 +303,6 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in)
     }
     av_assert0(ist);
 
-    ist->discard         = 0;
-    ist->decoding_needed |= DECODING_FOR_FILTER;
-    ist->st->discard = AVDISCARD_NONE;
-
     ifilter = ALLOC_ARRAY_ELEM(fg->inputs, fg->nb_inputs);
     ifilter->ist    = ist;
     ifilter->graph  = fg;
@@ -318,7 +314,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in)
     if (!ifilter->frame_queue)
         report_and_exit(AVERROR(ENOMEM));
 
-    ist_filter_add(ist, ifilter);
+    ist_filter_add(ist, ifilter, 0);
 }
 
 static int read_binary(const char *path, uint8_t **data, int *len)
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 46fa17beb2..92bca0cddd 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1218,12 +1218,6 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o,
     }
 
     if (ost->ist) {
-        ost->ist->discard = 0;
-        ost->ist->st->discard = ost->ist->user_set_discard;
-
-        if (ost->enc)
-            ost->ist->decoding_needed |= DECODING_FOR_OST;
-
         if (ost->enc &&
             (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) {
             ret = init_simple_filtergraph(ost->ist, ost);