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 B446045EA0 for ; Wed, 14 Jun 2023 16:50:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4105E68C41F; Wed, 14 Jun 2023 19:50:02 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 567D768BFCE for ; Wed, 14 Jun 2023 19:49:55 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 18628240177 for ; Wed, 14 Jun 2023 18:49:55 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id tWYv8cdC-3Af for ; Wed, 14 Jun 2023 18:49:54 +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 BB7022404EC for ; Wed, 14 Jun 2023 18:49:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 385203A04D0 for ; Wed, 14 Jun 2023 18:49:47 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Jun 2023 18:48:49 +0200 Message-Id: <20230614164908.28712-2-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230614164908.28712-1-anton@khirnov.net> References: <20230614164908.28712-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/21] fftools/ffmpeg_dec: simplify process_subtitle() 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: Its got_output argument always points to 1. --- fftools/ffmpeg.c | 3 +-- fftools/ffmpeg.h | 2 +- fftools/ffmpeg_dec.c | 9 +++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d62ccc56c9..45e71ed626 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -731,7 +731,6 @@ cleanup: static int fix_sub_duration_heartbeat(InputStream *ist, int64_t signal_pts) { int ret = AVERROR_BUG; - int got_output = 1; AVSubtitle *prev_subtitle = &ist->prev_sub.subtitle; AVSubtitle subtitle; @@ -744,7 +743,7 @@ static int fix_sub_duration_heartbeat(InputStream *ist, int64_t signal_pts) subtitle.pts = signal_pts; - return process_subtitle(ist, &subtitle, &got_output); + return process_subtitle(ist, &subtitle); } int trigger_fix_sub_duration_heartbeat(OutputStream *ost, const AVPacket *pkt) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 7b38812f74..7189629ad4 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -884,7 +884,7 @@ OutputStream *ost_iter(OutputStream *prev); void close_output_stream(OutputStream *ost); int trigger_fix_sub_duration_heartbeat(OutputStream *ost, const AVPacket *pkt); -int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_output); +int process_subtitle(InputStream *ist, AVSubtitle *subtitle); void update_benchmark(const char *fmt, ...); /** diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index c0c242147f..6582917a39 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -328,8 +328,9 @@ static void sub2video_flush(InputStream *ist) } } -int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_output) +int process_subtitle(InputStream *ist, AVSubtitle *subtitle) { + int got_output = 1; int ret = 0; if (ist->fix_sub_duration) { @@ -345,13 +346,13 @@ int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_output) ist->prev_sub.subtitle.end_display_time = end; } } - FFSWAP(int, *got_output, ist->prev_sub.got_output); + FFSWAP(int, got_output, ist->prev_sub.got_output); FFSWAP(AVSubtitle, *subtitle, ist->prev_sub.subtitle); if (end <= 0) goto out; } - if (!*got_output) + if (!got_output) return 0; for (int i = 0; i < ist->nb_filters; i++) { @@ -402,7 +403,7 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt) ist->frames_decoded++; - return process_subtitle(ist, &subtitle, &got_output); + return process_subtitle(ist, &subtitle); } static int send_filter_eof(InputStream *ist) -- 2.40.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".