From patchwork Mon Apr 4 11:30:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1915824pzb; Mon, 4 Apr 2022 04:40:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtKaRkjER94iuqRdQnjyF1i4thEjQ4kIjS1A/XwEuqOkHmfsjp5xNuVLEWPUPIsMCKbr9n X-Received: by 2002:a17:906:9c8e:b0:6df:f6bf:7902 with SMTP id fj14-20020a1709069c8e00b006dff6bf7902mr10361951ejc.191.1649072447211; Mon, 04 Apr 2022 04:40:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649072447; cv=none; d=google.com; s=arc-20160816; b=s1Q4xSKaQVEocbF9AgI007KVqWKlNrBzr3UMCruJw6pYzl8agO+eT6lxiWNx6fabvZ pGZwi+Tbk6BAxjylhD110IvD1dc0wXSKHb2UW4tvPGKIlcw80LG8INFm9kTIT/uvyomf /3e818blUuIDHLSDeGDo2wxsJiY/19usGQ8qkFuwA26xGJ6pz5ehsuMqPjkRaXkQ1d2v TDr0Zb6DiEmuqtD8c1AzZRRaAnE4LoNw+kCq5z0wsg40R/h3nNLBO7guIYu8UCoVl6kQ u9kR0KkRGPCD4heu4mFdxuhsxs4b6V0RDcA5ztXDS1FIJlafA15QbPmjoXni+9mw7+0S HYZA== 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=DJ7R7EaaAONbb6VHM0Y+AtdtIi3nXS/M3yXtnmCnGcc=; b=YTUu3jAH2/i/rUIxlddwUkeJQX6UU8BawMmXmEcbm5PvsvIg4yuB0LXH30TUDgziOU YFAuoLT77iOrLbEN9VHhOywbO+k5oQ1YlDPljy8+Tmzwm1g+cpb6fkqA1PeowoKylfGz aNi3SFfPNZANNDg5EpTg2iBtKgaY/nXrEU6Gs6g7Tv7hJbIx/VayBqlymw0aA1lVp1pO s0QUtD4hu6HoyYRTkxgVu5IbRRN9R9t+LnUpAUZ9pft5ZbC+G3muOIMo8SdzAh9RUckm OGaztR/MmZEwilK8rRiXB7aOKWsTbnwYRE3KqzzwLOwqFX7eCFTwz2gkr0PwDTI0zoT0 kt1g== 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 l25-20020a1709062a9900b006e4b4049463si6381475eje.429.2022.04.04.04.40.46; Mon, 04 Apr 2022 04:40:47 -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 2287E68B394; Mon, 4 Apr 2022 14:38:00 +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 481DC68B357 for ; Mon, 4 Apr 2022 14:37:51 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id EA8752400F5 for ; Mon, 4 Apr 2022 13:37:48 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id WwbZugHVoBJM for ; Mon, 4 Apr 2022 13:37:47 +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 0A86C24062A for ; Mon, 4 Apr 2022 13:37:42 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 410E23A0E35; Mon, 4 Apr 2022 13:32:12 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 13:30:31 +0200 Message-Id: <20220404113037.13070-44-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220404113037.13070-1-anton@khirnov.net> References: <20220404113037.13070-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 43/49] fftools/ffmpeg_mux: return errors from update_video_stats() 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: LnTmEWtSzN1l --- fftools/ffmpeg_mux.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 2cdbd5feef..087009e0eb 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -63,7 +63,7 @@ struct Muxer { static int want_sdp = 1; -static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write_vstats) +static int update_video_stats(OutputStream *ost, const AVPacket *pkt, int write_vstats) { const uint8_t *sd = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS, NULL); @@ -82,14 +82,14 @@ static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write } if (!write_vstats) - return; + return 0; /* this is executed just the first time update_video_stats is called */ if (!vstats_file) { vstats_file = fopen(vstats_filename, "w"); if (!vstats_file) { perror("fopen"); - exit_program(1); + return AVERROR(errno); } } @@ -116,6 +116,8 @@ static void update_video_stats(OutputStream *ost, const AVPacket *pkt, int write fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", (double)ost->data_size / 1024, ti1, bitrate, avg_bitrate); fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(ost->pict_type)); + + return 0; } static void close_all_output_streams(OutputStream *ost, OSTFinished this_stream, OSTFinished others) @@ -227,8 +229,11 @@ static int write_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt) ost->data_size += pkt->size; ost->packets_written++; - if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ost->encoding_needed) - update_video_stats(ost, pkt, !!vstats_filename); + if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && ost->encoding_needed) { + ret = update_video_stats(ost, pkt, !!vstats_filename); + if (ret < 0) + return ret; + } pkt->stream_index = ost->index;