From patchwork Wed Jun 14 16:48:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp189986pzb; Wed, 14 Jun 2023 09:50:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4uu8mnhwP7wy4bkhkq8aZKVWk+y2zEVnTsXrGs6vDjYx2n+Tjk4+1L0+fwVhuAeTtSHl+a X-Received: by 2002:aa7:ccc5:0:b0:506:83fc:2dab with SMTP id y5-20020aa7ccc5000000b0050683fc2dabmr9813384edt.22.1686761419797; Wed, 14 Jun 2023 09:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686761419; cv=none; d=google.com; s=arc-20160816; b=b9Cp8vXlZNW1/JI5OEbtICFyLZBnHMN9KEJitDYkx0jcCdR75x3+c8EU0UtUH4XyXn TRMvoLIIdblRGexf08zcHBtIU6xFd+szvKgueDO1W9FaYi8d9KpmWxMlKURNISGAWW8p LsCHnPETXQjjY3O0fsx4tpQmTPaLq89iD6JvRonOy8a/8SvJktkB1E+groNvJRh52AHX t6R2A/n++yHBiKOcJL5rz3j3IJ2DukgbuMWIf89d72nZYq9uo8yl9/E462MrTgCzKojc UQ0IEgm9/MJOeFO2CYnyUO7oEMiVW2sMMl7h+npeHgZAe3E9G50/ss9yFIe7q8r4d3pY Gd+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=yLhhvlgQmHIqGu2fzzqzdtkj3gN6FB9vJOuOO++RS2M=; b=dJgeK4ZAqFg4zsXz4UrVyUoefPcilrDRQ5RH7HfjSuiY2yuQUG5Gbdwc+rTiNHD7jL QBdlB42qTC5S+D+k2z8skN/Vmg80KX4A9XlPLL0wGTOf0ebjvhcnBTiw7oD8JTw0l7bO 7t2TWyGUViqrgi1mpTsEwqQTqHs8c1tGl9XbFgcxNNLgkVLRctyXpmHVngKg2UFIlX5c 4T3rvMxontvGG3UFQ5XHzQAXT1Vvk1xbRUwVrtGlWIKQXfcCFLX46QVKY44rU6gI/yvF p23ifiYZWtWpUyLNBl8pe0ABnto/4TImmC5bpOB2pQ8W0U9Va2ZeYOLBu8CXJhiaD/vw CVuw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r24-20020aa7d158000000b00519f6e05f88si541746edo.28.2023.06.14.09.50.16; Wed, 14 Jun 2023 09:50:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B70468C45B; Wed, 14 Jun 2023 19:50:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lshyujeIqPOP 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)