From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 96D0A43EA4 for ; Tue, 18 Oct 2022 12:38:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A38368BD68; Tue, 18 Oct 2022 15:38:25 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9627368BCF7 for ; Tue, 18 Oct 2022 15:38:20 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id DD87B2406C7 for ; Tue, 18 Oct 2022 14:38:17 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id cZ9psUygAl3y for ; Tue, 18 Oct 2022 14:38:16 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id A64A32405EC for ; Tue, 18 Oct 2022 14:38:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A877F3A168C for ; Tue, 18 Oct 2022 14:38:13 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 14:36:46 +0200 Message-Id: <20221018123701.25002-5-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018123701.25002-1-anton@khirnov.net> References: <20221018123701.25002-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/20] fftools/ffmpeg: drop free_input_threads() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 --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); -- 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".