From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B33B2471DA for ; Tue, 29 Aug 2023 11:57:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 56B1168C6A9; Tue, 29 Aug 2023 14:57:17 +0300 (EEST) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C06B68B1D3 for ; Tue, 29 Aug 2023 14:57:11 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-1c4c7a83bcdso3084720fac.0 for ; Tue, 29 Aug 2023 04:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693310229; x=1693915029; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=eCQDEw7Vex8L6MVFo6ob+hn7iuVYejLObVoXSxl1dBg=; b=gsGCX5cYlVvl531bjj1GVp31ZivS3qOoj7THi7iLPvVX7f1E39pV5DXbZDngGt9El/ UkNCIgakFlts0SxeL3XhPi5H8PP91/vd6kQ53gliewn1F4cPzb7RQfS5Ba1uUkV9kqwr KLd0I1fp4hegNGxIGGnUWcLFVqBvyQDaxJfYPiR+q+GAdykKsccMdmR85qnUlvVVhDfi bSQP6WRKW0ye90JoIG4/EejxPby+D0cv2SM2Npf3qh6HTz8h6xufDvhaplSWdKi9cV5i +I88qLzdTEgLQKIDjDenX+QgR1qbBQ3m/Ls6//uKxzVfIpl6gEU/0Upmp6Eao4HEgKGp V9Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693310229; x=1693915029; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eCQDEw7Vex8L6MVFo6ob+hn7iuVYejLObVoXSxl1dBg=; b=SIbfqaNknAJBxr8rMbsFYjqMo6vvr6f+TDf0ERSHZe2dL5IjezEPhaS+588+ht0kd0 6HAGCNn9ktZQOsVQ39rSg17LZn8yHuruxeC99BuoIK+2pL9+pIjxO5ssMUA4YEBallQj xB78Vm9FSL8rYoK4yIlcHwZZ00cRkKCmnEv6ygGUtdaVITpvkmgCl5Hdgri0zVibcozU 8ScdPvE9gcYTHeAVm7y1Gs7TD286azY7vvieFlheHWrN4rSIR0fG4gZdXJzijI457InK UXEzkrC67eNs/ncpJqqnwTaz5YYCE2aycTx8xVN9fZeZSvN1LZYHemnbtgZeVntosSDA eqeQ== X-Gm-Message-State: AOJu0Yzz4YYNtQuZbh/+AQN/1pzkbrsymUnxQZD0fHYg9KryI6YGZCTl T0xPyoE6jMCDx9U6AIc/PjuNhPc57Ro= X-Google-Smtp-Source: AGHT+IGe8A6lhUdpuQgl42a8WmoOaZTAqhL8LkxezN0700lXjM4vhLHuYX9IOdol2JbtQxvVFyY1+Q== X-Received: by 2002:a05:6870:73ce:b0:1b4:689b:209f with SMTP id a14-20020a05687073ce00b001b4689b209fmr15361863oan.52.1693310229061; Tue, 29 Aug 2023 04:57:09 -0700 (PDT) Received: from [192.168.0.10] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y72-20020a4a454b000000b005711b730d0asm5047633ooa.11.2023.08.29.04.57.07 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Aug 2023 04:57:08 -0700 (PDT) Message-ID: <2ee2a2a4-a27e-1800-6b62-12e63b1129aa@gmail.com> Date: Tue, 29 Aug 2023 08:57:06 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230829090751.2329-1-anton@khirnov.net> From: James Almer In-Reply-To: <20230829090751.2329-1-anton@khirnov.net> Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 8/29/2023 6:07 AM, Anton Khirnov wrote: > 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" }, Add the deprecated AVOption flag instead of that comment in the option description. LGTM with that change. > +#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 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".