From patchwork Mon May 8 09:17:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41534 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2181030pzb; Mon, 8 May 2023 02:19:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6QT4ai8fM7nFp6G+mZAwOdycq3ubAc3hOGeWIWWXTGzhwuV+6h2miLCDps/3AZonipwNUS X-Received: by 2002:a17:906:4fcf:b0:94e:1764:b09b with SMTP id i15-20020a1709064fcf00b0094e1764b09bmr8820552ejw.45.1683537597638; Mon, 08 May 2023 02:19:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683537597; cv=none; d=google.com; s=arc-20160816; b=q+YgIcHLUg0Dy3z54VuQVOonQhi+hgl4lwZRKkAVKO2Lz8LNdnyJyw4YKjSbdSEsub qAASLEunMZ9NRKXhGxKG1/dg0bG8ZbVD8wCbG9qDfipLWjjEwAJFUYz0KZAhhtGiOhTk xKt3FLQaby9oRcwAIK8aIPD5pADkAsdyveNFjKtBE0bvglEG/2wT0MY9xsBbXFphBqoC YSm/q4ecQOlOXATSPR45X6PkDkBq9HmpINVAkVYJF+ez88ZqAyXQBtD91BfgzoBJyQGc /la6OdE1MuvvdKGdhewkJxG4ZuY0GQ9q3j0MTGd0NgGVyOlWEPciDrFCzyEM5PxDsPSe Wy8A== 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=sXea10LMBrKCToG8dqHVHY7cCnaW3Xz5QO+6wrBqLGU=; b=yGFY8cJz9nglu8dW14SYbGDo5EfXW/hfculeFu2d4nL98TXPeBto6wo6zy0axaWacH 64Ym3fP7Mgeng9linJrpY1OAFyJFrE23AlSCqziLCnfRKMXsjjtOFiYomXCFwpEf9fp9 hefINizqfTQb5BWHXgXoOL+r5DThqDouzGg+f3eftvvOS6stP2aqeoCE/n6Z98W6LFA5 TXIWBh+eHvvjISiBIgfV5eXakAcWULaYYZzT0VSZhlUPOyXOu2c6SdRh+WVKtMJEfPvA 48dG1/hw+d0A4svx96uav+kRdTNn7pJtrWJnY329M0iryeHYTKk1aHmzzJ/OqfFAz41O lK/g== 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 h4-20020a1709063c0400b00959bbda5dc8si5586524ejg.1040.2023.05.08.02.19.57; Mon, 08 May 2023 02:19:57 -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 1BDE168C1B4; Mon, 8 May 2023 12:18:18 +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 34B8968C140 for ; Mon, 8 May 2023 12:18:06 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A53AA2404F5 for ; Mon, 8 May 2023 11:18:05 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id bqdYAjV5Q0AT for ; Mon, 8 May 2023 11:18:05 +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 CA13F240D1B for ; Mon, 8 May 2023 11:17:57 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BBD513A11B4 for ; Mon, 8 May 2023 11:17:57 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 May 2023 11:17:38 +0200 Message-Id: <20230508091738.20813-22-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230508091738.20813-1-anton@khirnov.net> References: <20230508091738.20813-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/22] fftools/ffmpeg: rename transcode_init() 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: LXJBBd64BAY6 It does no initialization anymore, except for setting transcode_init_done - the bulk of the function is printing the input/output maps. It also cannot fail anymore, so remove the useless return value. --- fftools/ffmpeg.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 45efa75047..ebd793a98c 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1493,11 +1493,8 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo return !eof_reached; } -static int transcode_init(void) +static void print_stream_maps(void) { - int ret = 0; - - /* dump the stream mapping */ av_log(NULL, AV_LOG_INFO, "Stream mapping:\n"); for (InputStream *ist = ist_iter(NULL); ist; ist = ist_iter(ist)) { for (int j = 0; j < ist->nb_filters; j++) { @@ -1570,13 +1567,6 @@ static int transcode_init(void) av_log(NULL, AV_LOG_INFO, " (copy)"); av_log(NULL, AV_LOG_INFO, "\n"); } - - if (ret) - return ret; - - atomic_store(&transcode_init_done, 1); - - return 0; } /** @@ -1854,9 +1844,9 @@ static int transcode(void) InputStream *ist; int64_t timer_start; - ret = transcode_init(); - if (ret < 0) - return ret; + print_stream_maps(); + + atomic_store(&transcode_init_done, 1); if (stdin_interaction) { av_log(NULL, AV_LOG_INFO, "Press [q] to stop, [?] for help\n");