From patchwork Sat Mar 25 19:15:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp226226pzh; Sat, 25 Mar 2023 12:18:26 -0700 (PDT) X-Google-Smtp-Source: AKy350blyv23oR5DerxwMBBmaNtwExXNlrMv2uPkdmSYmKY7/WR6304/qNcZ7niV+fyIHrscJ8AH X-Received: by 2002:aa7:c74d:0:b0:4ac:bbaa:867a with SMTP id c13-20020aa7c74d000000b004acbbaa867amr5920064eds.24.1679771906135; Sat, 25 Mar 2023 12:18:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679771906; cv=none; d=google.com; s=arc-20160816; b=BkUQ97w1rnR1lDL2Mt+oljX7fyHUQw1MSr2qm2P95jCd/LJENeSG0xiIxuZPEW2kh5 ZHikK+p1cf+4jHs/k9ruz2dGrVACpeeSgtVdAFqkwGBDcUIOR77Vh+pjPoxiS7FxEn2u jbBTYwxdspM0aC9e5DjkLEdP88W42CpFCy3hd3GxhoR5eB3l6FNg2zU7VsN/Oi/mfJ9x spC5oNJUkuVCkhWTwldkjS84lNc4nIO9iOt73zZLR7wmYvgea9W5QQJvO4u8gP0I6D3w ppzV5O6kh5437aMRPqyuYE/5xS0fBWjGjnLznh2x/mZu8RnMhyXNoumYxbWXppF1DNxE g2Yw== 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=QYXiBZTCGDJToYtBIliJCAgk1LG84ZZsoGNn1I61txM=; b=W5BpH6ABUEe/4Ncxq+k4eDkItXBGljClv0KrTA8QNAt6tDnPT+Pz7/LRmM8RzPdam9 7VIEy1PggSiHCItDW6JUIASWnHBzBOAzVwJevkzlmSK5sOJl31rdU51RLEemm2WbiOYP DSOTI8gk7TsjCpbV9FWDKV7XgCE8IA1SN63iwMCla1TKq8vHIrwf7zHajiKAbP41Yz5U nKZl6Qn9ZxheyEApi2twQniK0HuTJ7k0G3IW7RM+TyAtmJxZXEAuVAAYob4n1Z8ShVNu z//onxC4K1LLtjOKXxaGHFLZ91E9qJIw2r4iWu6DCKjFoNFLQvRmcOQik+jexKCA6Bkj PfGQ== 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 f2-20020a056402068200b004fd2b05171csi19202614edy.153.2023.03.25.12.18.25; Sat, 25 Mar 2023 12:18:26 -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 7656868CA1B; Sat, 25 Mar 2023 21:16:24 +0200 (EET) 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 98E0468C9AD for ; Sat, 25 Mar 2023 21:16:07 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B2E9A240591 for ; Sat, 25 Mar 2023 20:16:03 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id gmonrBlcqi2y for ; Sat, 25 Mar 2023 20:16:03 +0100 (CET) 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 F24092405EC for ; Sat, 25 Mar 2023 20:16:00 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id BFED23A05F0 for ; Sat, 25 Mar 2023 20:15:54 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Mar 2023 20:15:16 +0100 Message-Id: <20230325191529.10578-10-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230325191529.10578-1-anton@khirnov.net> References: <20230325191529.10578-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/23] fftools/ffmpeg: drop unnecessarily indirection 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: MT+QqFRmcZ9t init_output_stream() can print log messages directly, there is no need to ship them to the caller. --- fftools/ffmpeg.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a424c69725..77c41c7cc9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -724,23 +724,18 @@ early_exit: return float_pts; } -static int init_output_stream(OutputStream *ost, AVFrame *frame, - char *error, int error_len); +static int init_output_stream(OutputStream *ost, AVFrame *frame); static int init_output_stream_wrapper(OutputStream *ost, AVFrame *frame, unsigned int fatal) { int ret = AVERROR_BUG; - char error[1024] = {0}; if (ost->initialized) return 0; - ret = init_output_stream(ost, frame, error, sizeof(error)); + ret = init_output_stream(ost, frame); if (ret < 0) { - av_log(ost, AV_LOG_ERROR, "Error initializing output stream: %s\n", - error); - if (fatal) exit_program(1); } @@ -3188,8 +3183,7 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame) return 0; } -static int init_output_stream(OutputStream *ost, AVFrame *frame, - char *error, int error_len) +static int init_output_stream(OutputStream *ost, AVFrame *frame) { int ret = 0; @@ -3212,19 +3206,16 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame, ret = hw_device_setup_for_encode(ost); if (ret < 0) { - snprintf(error, error_len, "Device setup failed for " - "encoder on output stream #%d:%d : %s", - ost->file_index, ost->index, av_err2str(ret)); + av_log(ost, AV_LOG_ERROR, + "Encoding hardware device setup failed: %s\n", av_err2str(ret)); return ret; } if ((ret = avcodec_open2(ost->enc_ctx, codec, &ost->encoder_opts)) < 0) { if (ret == AVERROR_EXPERIMENTAL) abort_codec_experimental(codec, 1); - snprintf(error, error_len, - "Error while opening encoder for output stream #%d:%d - " - "maybe incorrect parameters such as bit_rate, rate, width or height", - ost->file_index, ost->index); + av_log(ost, AV_LOG_ERROR, "Error while opening encoder - maybe " + "incorrect parameters such as bit_rate, rate, width or height.\n"); return ret; }