From patchwork Thu Dec 14 19:31:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45136 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5185510pzf; Thu, 14 Dec 2023 11:32:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IGDh+3ZX731BC+ExYxSf+2+CYncn5E46MTdfxvKil8ZRoPk1t4e3aY9iZNA3dM6aA8YSwlH X-Received: by 2002:a1c:7213:0:b0:40c:25c8:12e1 with SMTP id n19-20020a1c7213000000b0040c25c812e1mr4841338wmc.12.1702582372161; Thu, 14 Dec 2023 11:32:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702582372; cv=none; d=google.com; s=arc-20160816; b=Ys1fuH1o2Rs7GnK6KL5AmvCnkJfAik/B68SHy4gDVPJ/RmAQtLZIaRslejf6BL8wuT 5prt5y3gUV94Gzq5R0EvafCnlVYMWvGJLxez07oKPhHamTeGjdjx8MtgmCRT7dVtsciE IWSJP9g41V590sMu20X9SoeDoPDkgb19Fx8YkF+goXruVuXYJEWAWgPCmpq//MEOnNZJ XnwWz/dkWA/PfJT8GAXMvK4gCpVnwWJ4me0icjlAN+4HixmPmHJa+0r3O76IHFI73tUF GItFGrqLnyTpZNhphbuXCgfCUW4UffgZja6BLiagTps8sBwwf68HiZJ7Q45tP5lAkZ1J uYiA== 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=5cqcHz/cu4mxJrjFyHPvqU0AuXWMZ3N5IgrkObXSi+4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=j2BNswmirSq1/wSIvOpwFnICbTKWoQ/D5B+o1ehXmhCfq7ZjXTRSLXVpirfABhgO0S gf3dNzSiLf52KzSQomhCFIXmcW7OXbXcfhsO7yXkYhCzXP8sz7rexJE1ZaxAzfA57XtJ sS+0jRlMGz8JZ7TaUL7shlGrDalZcN8xRpoKlwMF1KMLOckmlpZRqSI9j6KLHQTiZx12 CSVF7u5KrL9Ohyp/RpSwzTLi6u+kyOlYKfRa2BJydotWepNtbOwoCGCCSwHhtGpIU8kN LI704PXXzzsTPpbW11nbPWvC15glNvd5SP/RIc8T6JvILu3+t9VNNDBesWJR0InzYGBc 6R9A== 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 oq14-20020a170906cc8e00b00a1d53983286si6387320ejb.246.2023.12.14.11.32.50; Thu, 14 Dec 2023 11:32:52 -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 44BAD68D289; Thu, 14 Dec 2023 21:32:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00E6068D23D for ; Thu, 14 Dec 2023 21:32:39 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 2099A1CCB for ; Thu, 14 Dec 2023 20:32:39 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id h8p21kLkpX_I for ; Thu, 14 Dec 2023 20:32:38 +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 mail1.khirnov.net (Postfix) with ESMTPS id 5C31113BB for ; Thu, 14 Dec 2023 20:32:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 539773A0585 for ; Thu, 14 Dec 2023 20:32:31 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2023 20:31:31 +0100 Message-ID: <20231214193138.2503-2-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231214193138.2503-1-anton@khirnov.net> References: <20231214193138.2503-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/9] fftools/ffmpeg: deprecate -fps_mode/vsync drop 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: QAVu32mxQfvu It depends on the ability of muxers to generate timestamps, which is itself deprecated. --- doc/ffmpeg.texi | 3 --- fftools/ffmpeg.h | 3 +++ fftools/ffmpeg_filter.c | 9 +++++++-- fftools/ffmpeg_mux.c | 2 ++ fftools/ffmpeg_opt.c | 7 ++++++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index c503963941..f157c06e12 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1742,9 +1742,6 @@ constant frame rate. @item vfr (2) Frames are passed through with their timestamp or dropped so as to prevent 2 frames from having the same timestamp. -@item drop -As passthrough but destroys all timestamps, making the muxer generate -fresh timestamps based on frame-rate. @item auto (-1) Chooses between cfr and vfr depending on muxer capabilities. This is the default method. diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index affa80856a..96f4e757e1 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -60,6 +60,7 @@ #define FFMPEG_OPT_ENC_TIME_BASE_NUM 1 #define FFMPEG_OPT_TOP 1 #define FFMPEG_OPT_FORCE_KF_SOURCE_NO_DROP 1 +#define FFMPEG_OPT_VSYNC_DROP 1 #define FFMPEG_ERROR_RATE_EXCEEDED FFERRTAG('E', 'R', 'E', 'D') @@ -69,7 +70,9 @@ enum VideoSyncMethod { VSYNC_CFR, VSYNC_VFR, VSYNC_VSCFR, +#if FFMPEG_OPT_VSYNC_DROP VSYNC_DROP, +#endif }; enum EncTimeBase { diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index bb755d7bb4..9fc877b437 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -2104,8 +2104,11 @@ static void video_sync_process(OutputFilterPriv *ofp, AVFrame *frame, if (delta0 < 0 && delta > 0 && - ost->vsync_method != VSYNC_PASSTHROUGH && - ost->vsync_method != VSYNC_DROP) { + ost->vsync_method != VSYNC_PASSTHROUGH +#if FFMPEG_OPT_VSYNC_DROP + && ost->vsync_method != VSYNC_DROP +#endif + ) { if (delta0 < -0.6) { av_log(ost, AV_LOG_VERBOSE, "Past duration %f too large\n", -delta0); } else @@ -2143,7 +2146,9 @@ static void video_sync_process(OutputFilterPriv *ofp, AVFrame *frame, ofp->next_pts = llrint(sync_ipts); frame->duration = llrint(duration); break; +#if FFMPEG_OPT_VSYNC_DROP case VSYNC_DROP: +#endif case VSYNC_PASSTHROUGH: ofp->next_pts = llrint(sync_ipts); frame->duration = llrint(duration); diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 74df6dcb64..3ce4ef131e 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -150,8 +150,10 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) goto fail; } +#if FFMPEG_OPT_VSYNC_DROP if (ost->type == AVMEDIA_TYPE_VIDEO && ost->vsync_method == VSYNC_DROP) pkt->pts = pkt->dts = AV_NOPTS_VALUE; +#endif // rescale timestamps to the stream timebase if (ost->type == AVMEDIA_TYPE_AUDIO && !ost->enc) { diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 6177a96a4e..96d3c56fd7 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -188,7 +188,12 @@ int parse_and_set_vsync(const char *arg, int *vsync_var, int file_idx, int st_id if (!av_strcasecmp(arg, "cfr")) *vsync_var = VSYNC_CFR; else if (!av_strcasecmp(arg, "vfr")) *vsync_var = VSYNC_VFR; else if (!av_strcasecmp(arg, "passthrough")) *vsync_var = VSYNC_PASSTHROUGH; - else if (!av_strcasecmp(arg, "drop")) *vsync_var = VSYNC_DROP; +#if FFMPEG_OPT_VSYNC_DROP + else if (!av_strcasecmp(arg, "drop")) { + av_log(NULL, AV_LOG_WARNING, "-vsync/fps_mode drop is deprecated\n"); + *vsync_var = VSYNC_DROP; + } +#endif else if (!is_global && !av_strcasecmp(arg, "auto")) *vsync_var = VSYNC_AUTO; else if (!is_global) { av_log(NULL, AV_LOG_FATAL, "Invalid value %s specified for fps_mode of #%d:%d.\n", arg, file_idx, st_idx);