diff mbox series

[FFmpeg-devel,05/20] fftools/ffmpeg: drop free_input_threads()

Message ID 20221018123701.25002-5-anton@khirnov.net
State Accepted
Commit c20977c4e038b7c4b37ddcb300cf13a5881cc724
Headers show
Series [FFmpeg-devel,01/20] fftools/ffmpeg_opt: move opening input files to ffmpeg_demux.c | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov Oct. 18, 2022, 12:36 p.m. UTC 
Stop demuxer threads in ifile_close() instead. Simplifies the demuxer
API.
---
 fftools/ffmpeg.c       |  4 ----
 fftools/ffmpeg.h       |  1 -
 fftools/ffmpeg_demux.c | 17 ++++++-----------
 3 files changed, 6 insertions(+), 16 deletions(-)
diff mbox series

Patch

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index d29d2e4e88..3ad3fff5cd 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -555,7 +555,6 @@  static void ffmpeg_cleanup(int ret)
     for (i = 0; i < nb_output_files; i++)
         of_close(&output_files[i]);
 
-    free_input_threads();
     for (i = 0; i < nb_input_files; i++)
         ifile_close(&input_files[i]);
 
@@ -3932,7 +3931,6 @@  static int transcode(void)
         /* dump report by using the output first video and audio streams */
         print_report(0, timer_start, cur_time);
     }
-    free_input_threads();
 
     /* at the end of stream, we must flush the decoder buffers */
     for (i = 0; i < nb_input_streams; i++) {
@@ -3985,8 +3983,6 @@  static int transcode(void)
     ret = 0;
 
  fail:
-    free_input_threads();
-
     return ret;
 }
 
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 547660d5ef..823347f670 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -760,7 +760,6 @@  void ifile_close(InputFile **f);
  * - a negative error code on failure
  */
 int ifile_get_packet(InputFile *f, AVPacket **pkt);
-void free_input_threads(void);
 
 #define SPECIFIER_OPT_FMT_str  "%s"
 #define SPECIFIER_OPT_FMT_i    "%i"
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index d2db0663ab..5c75dd5b23 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -306,12 +306,12 @@  finish:
     return NULL;
 }
 
-static void free_input_thread(int i)
+static void thread_stop(Demuxer *d)
 {
-    InputFile *f = input_files[i];
+    InputFile *f = &d->f;
     DemuxMsg msg;
 
-    if (!f || !f->in_thread_queue)
+    if (!f->in_thread_queue)
         return;
     av_thread_message_queue_set_err_send(f->in_thread_queue, AVERROR_EOF);
     while (av_thread_message_queue_recv(f->in_thread_queue, &msg, 0) >= 0)
@@ -322,14 +322,6 @@  static void free_input_thread(int i)
     av_thread_message_queue_free(&f->audio_duration_queue);
 }
 
-void free_input_threads(void)
-{
-    int i;
-
-    for (i = 0; i < nb_input_files; i++)
-        free_input_thread(i);
-}
-
 static int thread_start(Demuxer *d)
 {
     int ret;
@@ -426,10 +418,13 @@  int ifile_get_packet(InputFile *f, AVPacket **pkt)
 void ifile_close(InputFile **pf)
 {
     InputFile *f = *pf;
+    Demuxer   *d = demuxer_from_ifile(f);
 
     if (!f)
         return;
 
+    thread_stop(d);
+
     avformat_close_input(&f->ctx);
 
     av_freep(pf);