From patchwork Mon Apr 4 11:29:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 35167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1912506pzb; Mon, 4 Apr 2022 04:34:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqvXIlLwt0vTyDI3umfWsMO9ADMmdznaJZ0SW9S+R28yb3EIXAkFy2na0cYrm0+HSp0PZh X-Received: by 2002:a17:906:99c5:b0:6df:8215:4ccd with SMTP id s5-20020a17090699c500b006df82154ccdmr10319442ejn.684.1649072067421; Mon, 04 Apr 2022 04:34:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649072067; cv=none; d=google.com; s=arc-20160816; b=jMTiJB032u+Eail+iX3SXr1H7HGqgL1XzQg4luXgFoSWpItYJrCMpY2wyGselzmJ6G 5RfYP6YWdSvc6jy1oAvc1PWMhf+Po+EXoUBjiDjQHCGZSeilixEEe6XgNiQPipfq7/ge NY4/Da1T6qRYpMiXtQ17ZZzMhXqNrcDLjMo3oqEdPA7ibIje5MicSzrzHh1BqcPg7XUa LxH9qMeORxAgBN+LNGXTll/ocw6lIbCcgsa/Y0gT9GGWNSL/QNn76/lUNqoTSJFE6moS DQZ/5Ko8PqM+ihUbA8coCVO4ebT1iPZcQATcA0mTQt8njhhryXzWQuXAh7zTf7k2rsKK PvBg== 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=6EBiTk8XwbVv3NmD/y4ti2iT3Sr4cggEiJ9ZZ0M85VU=; b=Yr+a84uvtHiWBuxFTSNGmuEbN3rGmQiU5oTpkPHzJ9OdUd4Q3Bsz69OaNNWF/FTuJ8 JxE0sBspcVxPZrCirCod10iilI7WpfzFtMp2JzVp23894O2EgrXfIfbhGq9TpNKu2XNh wLyvUWLkSSaoTbhMkR01m3KkvIsdIXMaq1BdVqYPLvzwUbYMjvEbM9yAKoT4i0fsLAYt m6ONTP0ZsCHVK3mBQT//gm2Fe9hdipjckPySSKAnjlEdhfCHv1tHgMpdui9wXlvqWQib 9sIZQ28hI70tRsTX7yviDE92+y5rko+8/7AbXTsw7hM520aZJDFKM625F/ToWg0tQ+rq q8EA== 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 v1-20020aa7d9c1000000b0041cdc4992aasi400057eds.456.2022.04.04.04.34.27; Mon, 04 Apr 2022 04:34:27 -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 EA17768B261; Mon, 4 Apr 2022 14:32:34 +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 75CAE68A8A0 for ; Mon, 4 Apr 2022 14:32:23 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B29E224017C for ; Mon, 4 Apr 2022 13:32:22 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id aJQz0QI9tGZQ for ; Mon, 4 Apr 2022 13:32:20 +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 4E10024056A for ; Mon, 4 Apr 2022 13:32:15 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id C1A7E3A09B5; Mon, 4 Apr 2022 13:32:11 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 13:29:59 +0200 Message-Id: <20220404113037.13070-12-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 11/49] fftools/ffmpeg: add a helper function to access output file size 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: PM0sinZdu2LS Stop accessing muxer internals from outside of ffmpeg_mux. --- fftools/ffmpeg.c | 10 +--------- fftools/ffmpeg.h | 1 + fftools/ffmpeg_mux.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a85ed18b08..52dffa57bd 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1513,8 +1513,7 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti { AVBPrint buf, buf_script; OutputStream *ost; - AVFormatContext *oc; - int64_t total_size; + int64_t total_size = of_filesize(output_files[0]); AVCodecContext *enc; int frame_number, vid, i; double bitrate; @@ -1543,13 +1542,6 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti t = (cur_time-timer_start) / 1000000.0; - - oc = output_files[0]->ctx; - - total_size = avio_size(oc->pb); - if (total_size <= 0) // FIXME improve avio_size() so it works with non seekable output too - total_size = avio_tell(oc->pb); - vid = 0; av_bprint_init(&buf, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(&buf_script, 0, AV_BPRINT_SIZE_AUTOMATIC); diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 3db03e0cfe..fa7b202ae6 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -698,5 +698,6 @@ void of_close(OutputFile **pof); void of_write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int unqueue); +int64_t of_filesize(OutputFile *of); #endif /* FFTOOLS_FFMPEG_H */ diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 84c94e46be..930a7bdfe7 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -346,3 +346,17 @@ int of_muxer_init(OutputFile *of) return 0; } + +int64_t of_filesize(OutputFile *of) +{ + AVIOContext *pb = of->ctx->pb; + int64_t ret = -1; + + if (pb) { + ret = avio_size(pb); + if (ret <= 0) // FIXME improve avio_size() so it works with non seekable output too + ret = avio_tell(pb); + } + + return ret; +}