From patchwork Fri Jul 7 09:48:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42490 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp7162702pzh; Fri, 7 Jul 2023 02:51:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlFNdKS9WJvFwoRWNnOcGq3LEUAPt1DQFmGIqSQvA63cJZ90/Y6dCpahkdaMgCMtuX/rju9H X-Received: by 2002:a17:906:cc57:b0:989:21e4:6c6e with SMTP id mm23-20020a170906cc5700b0098921e46c6emr3385449ejb.53.1688723496847; Fri, 07 Jul 2023 02:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688723496; cv=none; d=google.com; s=arc-20160816; b=Kq63ie5Z0NkrOeG1HWzuEsYTVbuFY6GYh7Qcf2slSSUEBtP1bVhLN0tvXPDsUaj79M 63f1ypy9LW+ofPt+MgfBRRucswH5jbL3LwKrBpJ9UfHTFsvwyPBU8G0U1O2H0lktsJuQ I0hSoGyVPW5OlWV6J6ORcV+GCSsZ0cmcFhQETMiCeX6ozKtP/YEw9u0DvZOwYX3wWiID c62dXVBr0dY4CO5wJyjtf2ygGL1OPbpMihTs+8J7jD7uW0FRi4m3odmTzadQlwFJGS43 YXS4iQRe7RXky5FS1eA9v1qLnTjEeWBX2KNqeQ+eGOp5TLWQZ9nJjfeo5yTHLFgqezQ0 73XQ== 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=rE1ScvcuaXj726+RkHK/o8zojtz3tr3f7WuzTfBnf8A=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=V5AYUnQsjIjr/lX8gZy4Rum7VrLII4O7rp40FYVGxMlFhsi+4aQwxJKp1WpDrI5LiU xUfy1vRD1BYVIfNu5k75eWfnf1Z3/sxc1QQni4wiydD9erUmP6mKAn9PNUoeBuTz8i0K iG4ftSt7VWvpvXhdaOinLhOpHO5qLimEA14g6+D7dqJARFvQIZAtUhljn+Yfjy7Rszzr DML25YqxiEQABu5/a7FQFywyo+qnQGY8aAhDdt694eZi5suGOHgIFDbD5K00xH7Z7+T5 OwFiLqbaZsBLffio+C7fwr4bvBCBOOb5x+Aw4lU5fROVQG1Ixk6JfKzO4Z+qIrs7W9gA bccA== 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 u21-20020a170906c41500b00992bf74c314si1796914ejz.983.2023.07.07.02.51.36; Fri, 07 Jul 2023 02:51:36 -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 67FD8687F3A; Fri, 7 Jul 2023 12:49:25 +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 016E068C73D for ; Fri, 7 Jul 2023 12:49:11 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BB7C42404EA for ; Fri, 7 Jul 2023 11:49:11 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Dzes6PyM8I5d for ; Fri, 7 Jul 2023 11:49:07 +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 055E32406CE for ; Fri, 7 Jul 2023 11:49:01 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 2F1583A1AF1 for ; Fri, 7 Jul 2023 11:48:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jul 2023 11:48:46 +0200 Message-Id: <20230707094847.25324-21-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230707094847.25324-1-anton@khirnov.net> References: <20230707094847.25324-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/22] fftools/ffmpeg: rework -enc_time_base handling 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: xUlesYPTk0eh Read the timebase from FrameData rather than the input stream. This should fix #10393 and generally be more reliable. Replace the use of '-1' to indicate demuxing timebase with the string 'demux'. Also allow to request filter timebase with '-enc_time_base filter'. --- doc/ffmpeg.texi | 7 ++++--- fftools/ffmpeg.h | 6 ++++++ fftools/ffmpeg_enc.c | 16 ++++++++++++++-- fftools/ffmpeg_mux_init.c | 29 ++++++++++++++++++----------- tests/fate/video.mak | 2 +- 5 files changed, 43 insertions(+), 17 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 6769f8d305..59e9fbfcb2 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1812,10 +1812,11 @@ Assign a default value according to the media type. For video - use 1/framerate, for audio - use 1/samplerate. -@item -1 -Use the input stream timebase when possible. +@item demux +Use the timebase from the demuxer. -If an input stream is not available, the default timebase will be used. +@item filter +Use the timebase from the filtergraph. @item >0 Use the provided number as the timebase. diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 28474c1162..59ce29d815 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -56,6 +56,7 @@ #define FFMPEG_ROTATION_METADATA 1 #define FFMPEG_OPT_QPHIST 1 #define FFMPEG_OPT_ADRIFT_THRESHOLD 1 +#define FFMPEG_OPT_ENC_TIME_BASE_NUM 1 enum VideoSyncMethod { VSYNC_AUTO = -1, @@ -66,6 +67,11 @@ enum VideoSyncMethod { VSYNC_DROP, }; +enum EncTimeBase { + ENC_TIME_BASE_DEMUX = -1, + ENC_TIME_BASE_FILTER = -2, +}; + #define MAX_STREAMS 1024 /* arbitrary sanity check value */ enum HWAccelID { diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 612bf23770..6fafd3ff60 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -264,8 +264,20 @@ int enc_open(OutputStream *ost, AVFrame *frame) fr.num, fr.den, 65535); } - enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase : - av_inv_q(fr); + if (ost->enc_timebase.num == ENC_TIME_BASE_DEMUX) { + if (fd->dec.tb.num <= 0 || fd->dec.tb.den <= 0) { + av_log(ost, AV_LOG_ERROR, + "Demuxing timebase not available - cannot use it for encoding\n"); + return AVERROR(EINVAL); + } + + enc_ctx->time_base = fd->dec.tb; + } else if (ost->enc_timebase.num == ENC_TIME_BASE_FILTER) { + enc_ctx->time_base = frame->time_base; + } else { + enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase : + av_inv_q(fr); + } if (!(enc_ctx->time_base.num && enc_ctx->time_base.den)) enc_ctx->time_base = frame->time_base; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 6ab541d7c5..89da128881 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1140,20 +1140,27 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, MATCH_PER_STREAM_OPT(enc_time_bases, str, enc_time_base, oc, st); if (enc_time_base) { AVRational q; - if (av_parse_ratio(&q, enc_time_base, INT_MAX, 0, NULL) < 0 || - q.den <= 0) { - av_log(ost, AV_LOG_FATAL, "Invalid time base: %s\n", enc_time_base); - exit_program(1); - } - if (q.num < 0) { - if (!ost->ist) { - av_log(ost, AV_LOG_FATAL, - "Cannot use input stream timebase for encoding - " - "no input stream available\n"); + if (!strcmp(enc_time_base, "demux")) { + q = (AVRational){ ENC_TIME_BASE_DEMUX, 0 }; + } else if (!strcmp(enc_time_base, "filter")) { + q = (AVRational){ ENC_TIME_BASE_FILTER, 0 }; + } else { + ret = av_parse_ratio(&q, enc_time_base, INT_MAX, 0, NULL); + if (ret < 0 || q.den <= 0 +#if !FFMPEG_OPT_ENC_TIME_BASE_NUM + || q.num < 0 +#endif + ) { + av_log(ost, AV_LOG_FATAL, "Invalid time base: %s\n", enc_time_base); exit_program(1); } - q = ost->ist->st->time_base; +#if FFMPEG_OPT_ENC_TIME_BASE_NUM + if (q.num < 0) + av_log(ost, AV_LOG_WARNING, "-enc_time_base -1 is deprecated," + " use -enc_timebase demux\n"); +#endif } + ost->enc_timebase = q; } } else { diff --git a/tests/fate/video.mak b/tests/fate/video.mak index a2011d0dad..4e7a77537f 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -270,7 +270,7 @@ FATE_VIDEO-$(call FRAMECRC, MXG, MXPEG) += fate-mxpeg fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mxpeg/m1.mxg -an FATE_NUV += fate-nuv-rtjpeg -fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/Today.nuv -an -enc_time_base -1 +fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/Today.nuv -an -enc_time_base demux FATE_NUV += fate-nuv-rtjpeg-fh fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/rtjpeg_frameheader.nuv -an