From patchwork Tue Aug 29 09:07:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 43391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3822:b0:149:dfde:5c0a with SMTP id p34csp674000pzf; Tue, 29 Aug 2023 02:08:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHKajD0zEyLQw/z5YJsbkV+kALj/+boSv3anWSZ5U4bMzw2oJmeFAPNU2oWtMjCIspQtJeb X-Received: by 2002:a17:907:7848:b0:9a1:f1b2:9f2e with SMTP id lb8-20020a170907784800b009a1f1b29f2emr2461896ejc.2.1693300098745; Tue, 29 Aug 2023 02:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693300098; cv=none; d=google.com; s=arc-20160816; b=LEP+tUU/xCQPZVnDL4HV+WYwYrFwI0g/yQmfeREz++j4K/9nA6zxckFCeTSnriGmQ6 NoDnmgzS9+jMOL5XkxzwX/Jag7VkMkfSvH210yQWfB+mZps30JG96fy5FeFaHl2okRb+ TlQkNkgH1h3z05uDIW0SkUouGHxt+ZuQbCf2kXn3TuR00u52LlQDk8Vb/UlLvEOtG/uh hkwHKFdmqynPOKgNinzYApvgdl/yhtxh7a5d0FVGq3RT2+VuJKu3MMTYF/3GGLmcTIPt S5Ci2gz35NI3VDp6o9AQdbeqEyi/+voextQksyJwvuixc5ph4/yOkr5HIQdiVcVxISkb JVJg== 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:message-id:date:to:from :delivered-to; bh=4wY17HXrVncl6RG1zcAtWwp0LVNt1rH9tbeeaCVlgso=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=pVugtUPiXTo2q9Z91/s8MnsUFcI3dHBDQlo9S7RwZgHv3v3QTcsMdhekDGCjWoCHxP 1TGhek7PRUFDcUt/AaEWBbnJBg9TrsxS+E+nujqccQgMuXc8ynPkty5OklZYPhwwR/qu +crs1YJDyFiZkakzgzXpfhrGnbTZXaA9cjNFC0FfHjblP4nLIUOxHNODk5WANUREwJIT p5nUL3DZKeIcBc86OipMVg0/3p+Jyfld/QFWIu73rDGHf3G4n2yOhPIZP1/AKARVJyMR A11cEc4O/OrPFH9i5tCK9nyxlT8+AuXD1KmQzkc2PV63L7oFsvMp69uDMwuc70vVLyrQ p9Qg== 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 f13-20020a170906048d00b0099cfea2e0ecsi5725845eja.634.2023.08.29.02.08.18; Tue, 29 Aug 2023 02:08:18 -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 5F9AF68C658; Tue, 29 Aug 2023 12:08:14 +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 8FBFF6806DE for ; Tue, 29 Aug 2023 12:08:07 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 003D02401A4 for ; Tue, 29 Aug 2023 11:08:07 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id laFEksG0ZmZe for ; Tue, 29 Aug 2023 11:08:06 +0200 (CEST) Received: from mail1.khirnov.net (mail1.khirnov.net [IPv6:2a00:c500:561:206::5]) (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 "mail1.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3C4AD240177 for ; Tue, 29 Aug 2023 11:08:06 +0200 (CEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 97A6D40E1 for ; Tue, 29 Aug 2023 11:10:12 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id kPWA9_oSm_du for ; Tue, 29 Aug 2023 11:10:08 +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 mail1.khirnov.net (Postfix) with ESMTPS id DEC14265 for ; Tue, 29 Aug 2023 11:10:07 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 042923A022D for ; Tue, 29 Aug 2023 11:07:53 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 29 Aug 2023 11:07:51 +0200 Message-Id: <20230829090751.2329-1-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf: deprecate AVFMT_FLAG_SHORTEST 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: NMKJYuCML3CW It was added in cb114ed4640 with the comment "This will allow fixing several bugs with the -shortest option". Since * there is no explanation of what these bugs are * libavformat is not the place to work around ffmpeg CLI bugs * there is no indication that this feature is actually in use deprecate it without replacement. --- doc/APIchanges | 3 +++ libavformat/avformat.h | 2 ++ libavformat/internal.h | 2 ++ libavformat/mux.c | 2 ++ libavformat/options.c | 2 ++ libavformat/options_table.h | 4 +++- libavformat/version_major.h | 1 + 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index ad1efe708d..001de4544b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-08-xx - xxxxxxxxxx - lavf 60 - avformat.h + Deprecate AVFMT_FLAG_SHORTEST without replacement. + 2023-08-18 - xxxxxxxxxx - lavu 58.17.100 - channel_layout.h All AV_CHANNEL_LAYOUT_* macros are now compatible with C++ 17 and older. diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1916aa2dc5..8a145a8a8b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1241,7 +1241,9 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_BITEXACT 0x0400 #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) #define AVFMT_FLAG_FAST_SEEK 0x80000 ///< Enable fast, but inaccurate seeks for some formats +#if FF_API_LAVF_SHORTEST #define AVFMT_FLAG_SHORTEST 0x100000 ///< Stop muxing when the shortest stream stops. +#endif #define AVFMT_FLAG_AUTO_BSF 0x200000 ///< Add bitstream filters as requested by the muxer /** diff --git a/libavformat/internal.h b/libavformat/internal.h index 594afd731d..a016ef197d 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -152,10 +152,12 @@ typedef struct FFFormatContext { int avoid_negative_ts_use_pts; +#if FF_API_LAVF_SHORTEST /** * Timestamp of the end of the shortest stream. */ int64_t shortest_end; +#endif /** * Whether or not avformat_init_output has already been called diff --git a/libavformat/mux.c b/libavformat/mux.c index 415bd3948f..b7ae90f3c4 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -990,6 +990,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt, } } +#if FF_API_LAVF_SHORTEST if (si->packet_buffer.head && eof && (s->flags & AVFMT_FLAG_SHORTEST) && @@ -1025,6 +1026,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt, flush = 0; } } +#endif if (stream_count && flush) { PacketListEntry *pktl = si->packet_buffer.head; diff --git a/libavformat/options.c b/libavformat/options.c index e4a3aceed0..194042820e 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -190,7 +190,9 @@ FF_ENABLE_DEPRECATION_WARNINGS return NULL; } +#if FF_API_LAVF_SHORTEST si->shortest_end = AV_NOPTS_VALUE; +#endif return s; } diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 86d836cfeb..9aacd1ca2b 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -51,7 +51,9 @@ static const AVOption avformat_options[] = { {"fastseek", "fast but inaccurate seeks", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_FAST_SEEK }, INT_MIN, INT_MAX, D, "fflags"}, {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, {"bitexact", "do not write random/volatile data", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_BITEXACT }, 0, 0, E, "fflags" }, -{"shortest", "stop muxing with the shortest stream", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_SHORTEST }, 0, 0, E, "fflags" }, +#if FF_API_LAVF_SHORTEST +{"shortest", "stop muxing with the shortest stream (deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_SHORTEST }, 0, 0, E, "fflags" }, +#endif {"autobsf", "add needed bsfs automatically", 0, AV_OPT_TYPE_CONST, { .i64 = AVFMT_FLAG_AUTO_BSF }, 0, 0, E, "fflags" }, {"seek2any", "allow seeking to non-keyframes on demuxer level when supported", OFFSET(seek2any), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, D}, {"analyzeduration", "specify how many microseconds are analyzed to probe the input", OFFSET(max_analyze_duration), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, D}, diff --git a/libavformat/version_major.h b/libavformat/version_major.h index 293fbd3397..e7e80184f7 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -45,6 +45,7 @@ #define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVFORMAT_IO_CLOSE (LIBAVFORMAT_VERSION_MAJOR < 61) +#define FF_API_LAVF_SHORTEST (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_R_FRAME_RATE 1