From patchwork Mon Dec 13 15:20:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 32431 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5574671iog; Mon, 13 Dec 2021 07:24:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzetLuoHRfnuKiW0vHm5Ci15IYdZ2UpA3V7lUU2V18sA2Tw9Mj9pQB7K/ep63TRbl2UHGsm X-Received: by 2002:a17:906:974a:: with SMTP id o10mr45045524ejy.226.1639409057625; Mon, 13 Dec 2021 07:24:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639409057; cv=none; d=google.com; s=arc-20160816; b=cd4Z8WESbPScOl+kIg/aZ/X43Mv1paNlNgMs+eNsw0PpjoQ+n4V57uC9ToIAvR3/NS TTU6Q5Ouwua4dLp6RDuffpWQbStfcQeaOwQ44kcEKerk1EEAJhM37aulidnU16AQQEaU GK8//cARPLgzcL3HAdmnJeqc+sYbjNEitCSeFgVmEmkceqX8Il/ze2I0+DUspL202Z4d +e8IK/LO91z/Yyz2Vn3uH5VtvLQ1cBnseteECcJ2AMjJ9SCqpbgwbJZGC0iLduYj3owa umbATdpd+iiVJ7jzjxkI3UmoGK+jN8beusnDLW4D74nTT73PcS+dOUVA5bX7b2ZYk775 AWAQ== 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=89zDMh5h9cCmjfjwVrN1dh2V17qVl7x4GmZe6JWXcAM=; b=meZrPQY5+ZWBXkcOkXr/khOUcxm4SLZnX/1yvABMubrw0fA+ofPr03B0pSF4Q9bto6 C1KcGphwrf3gBuQv20l7AhL+oYAaIb4BtjzDd12HbQDaV7OzrRLMQAv8etkpC4hcJjBw ZC/ljIwJAgh9tRCftNXuGtr3O+Tck7/rAZIREUeYzxAmPns0Ik/7Ce4gKQWaPl7G8S6A 4PTRtEDCqH7eeppPYWc0trEHiiZfK69pZDlhpimh6hkj45PhIotZLEktM0KQkooQ/KVY 2MeD4OqUgzpvZZQzMAaNS4rRsx/F2xb6HXwmlmjaBUkkRlPKAtR/V5+EMMQcMvETn0nP KQkQ== 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 a5si16973737edy.585.2021.12.13.07.24.17; Mon, 13 Dec 2021 07:24:17 -0800 (PST) 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 3533D68AFC9; Mon, 13 Dec 2021 17:22:26 +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 759A368AFA1 for ; Mon, 13 Dec 2021 17:22:14 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 40EF524055A for ; Mon, 13 Dec 2021 16:22:11 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 2pXlerp2nlUJ for ; Mon, 13 Dec 2021 16:22:10 +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 A55A3240555 for ; Mon, 13 Dec 2021 16:22:07 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 3102C3A09DE; Mon, 13 Dec 2021 16:22:07 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 16:20:28 +0100 Message-Id: <20211213152042.5900-10-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211213152042.5900-1-anton@khirnov.net> References: <20211213152042.5900-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/24] ffmpeg: refactor limiting output file size with -fs 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: YTQtKxDzbhJ5 Move the file size checking code to ffmpeg_mux. Stop calling avio_tell(), which is a potentially heavy operation - use the recently introduced bytes_written instead. --- fftools/ffmpeg.c | 4 +--- fftools/ffmpeg.h | 4 ++-- fftools/ffmpeg_mux.c | 14 +++++++++++++- fftools/ffmpeg_opt.c | 3 +-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 8a7cab3fab..3ed1201fda 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3505,10 +3505,8 @@ static int need_output(void) for (i = 0; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i]; OutputFile *of = output_files[ost->file_index]; - AVFormatContext *os = output_files[ost->file_index]->ctx; - if (ost->finished || - (os->pb && avio_tell(os->pb) >= of->limit_filesize)) + if (ost->finished || of_finished(of)) continue; if (ost->frame_number >= ost->max_frames) { int j; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 279a99cc48..67ff391334 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -586,7 +586,6 @@ typedef struct OutputFile { int ost_index; /* index of the first stream in output_streams */ int64_t recording_time; ///< desired length of the resulting file in microseconds == AV_TIME_BASE units int64_t start_time; ///< start time in microseconds == AV_TIME_BASE units - uint64_t limit_filesize; /* filesize limit expressed in bytes */ int shortest; } OutputFile; @@ -687,7 +686,7 @@ int hw_device_setup_for_filter(FilterGraph *fg); int hwaccel_decode_init(AVCodecContext *avctx); -int of_muxer_init(OutputFile *of); +int of_muxer_init(OutputFile *of, uint64_t limit_filesize); /* open the muxer when all the streams are initialized */ int of_check_init(OutputFile *of); int of_write_trailer(OutputFile *of); @@ -695,5 +694,6 @@ void of_close(OutputFile **pof); void of_write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int unqueue); +int of_finished(OutputFile *of); #endif /* FFTOOLS_FFMPEG_H */ diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index cf85db674e..aba4b563a4 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -33,6 +33,8 @@ #include "ffmpeg.h" struct Muxer { + /* filesize limit expressed in bytes */ + uint64_t limit_filesize; int header_written; }; @@ -336,7 +338,7 @@ void of_close(OutputFile **pof) av_freep(pof); } -int of_muxer_init(OutputFile *of) +int of_muxer_init(OutputFile *of, uint64_t limit_filesize) { Muxer *mux = av_mallocz(sizeof(*mux)); @@ -345,5 +347,15 @@ int of_muxer_init(OutputFile *of) of->mux = mux; + mux->limit_filesize = limit_filesize; + + return 0; +} + +int of_finished(OutputFile *of) +{ + AVIOContext *pb = of->ctx->pb; + if (pb && pb->bytes_written >= of->mux->limit_filesize) + return 1; return 0; } diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 5b42b450f3..09301acb03 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2287,7 +2287,6 @@ static int open_output_file(OptionsContext *o, const char *filename) of->ost_index = nb_output_streams; of->recording_time = o->recording_time; of->start_time = o->start_time; - of->limit_filesize = o->limit_filesize; of->shortest = o->shortest; av_dict_copy(&of->opts, o->g->format_opts, 0); @@ -2886,7 +2885,7 @@ loop_end: exit_program(1); } - err = of_muxer_init(of); + err = of_muxer_init(of, o->limit_filesize); if (err < 0) { av_log(NULL, AV_LOG_FATAL, "Error initializing the muxer\n"); exit_program(1);