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 776D54446D for ; Wed, 12 Oct 2022 17:39:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D463C68BD36; Wed, 12 Oct 2022 20:39:50 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFD4968BBDB for ; Wed, 12 Oct 2022 20:39:44 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 4A9532404E4; Wed, 12 Oct 2022 19:39:44 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id R5IraSv-KV4m; Wed, 12 Oct 2022 19:39:43 +0200 (CEST) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (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 "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 99CDA2400F4; Wed, 12 Oct 2022 19:39:43 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id B79C91601B2; Wed, 12 Oct 2022 19:39:43 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220928102101.37967-1-epirat07@gmail.com> References: <20220928102101.37967-1-epirat07@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches , Marvin Scholz Date: Wed, 12 Oct 2022 19:39:43 +0200 Message-ID: <166559638370.12287.16758170459214904063@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] ffmpeg: Make find_stream_info behave like a normal per-file option 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 Cc: Marvin Scholz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting Marvin Scholz (2022-09-28 12:21:00) > Currently it would essentially change the find_stream_info setting for > the file it was specified for and all following files, which is unusual > and somewhat unexpected behaviour for a per-file option and not even > documented to behave like this. Well, it's not documented at all. > --- > fftools/ffmpeg.h | 1 + > fftools/ffmpeg_opt.c | 7 ++++--- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h > index ede0b2bd96..3389ce5edc 100644 > --- a/fftools/ffmpeg.h > +++ b/fftools/ffmpeg.h > @@ -126,6 +126,7 @@ typedef struct OptionsContext { > int accurate_seek; > int thread_queue_size; > int input_sync_ref; > + int find_stream_info; > > SpecifierOpt *ts_scale; > int nb_ts_scale; > diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c > index 5febe319e4..df1c8df454 100644 > --- a/fftools/ffmpeg_opt.c > +++ b/fftools/ffmpeg_opt.c > @@ -190,7 +190,6 @@ static int input_stream_potentially_available = 0; > static int ignore_unknown_streams = 0; > static int copy_unknown_streams = 0; > static int recast_media = 0; > -static int find_stream_info = 1; > > static void uninit_options(OptionsContext *o) > { > @@ -240,6 +239,7 @@ static void init_options(OptionsContext *o) > o->accurate_seek = 1; > o->thread_queue_size = -1; > o->input_sync_ref = -1; > + o->find_stream_info = 1; > o->shortest_buf_duration = 10.f; > } > > @@ -1307,7 +1307,7 @@ static int open_input_file(OptionsContext *o, const char *filename) > for (i = 0; i < ic->nb_streams; i++) > choose_decoder(o, ic, ic->streams[i], HWACCEL_NONE, AV_HWDEVICE_TYPE_NONE); > > - if (find_stream_info) { > + if (o->find_stream_info) { > AVDictionary **opts = setup_find_stream_info_opts(ic, o->g->codec_opts); > int orig_nb_streams = ic->nb_streams; > > @@ -4000,7 +4000,8 @@ const OptionDef options[] = { > { "thread_queue_size", HAS_ARG | OPT_INT | OPT_OFFSET | OPT_EXPERT | OPT_INPUT | OPT_OUTPUT, > { .off = OFFSET(thread_queue_size) }, > "set the maximum number of queued packets from the demuxer" }, > - { "find_stream_info", OPT_BOOL | OPT_PERFILE | OPT_INPUT | OPT_EXPERT, { &find_stream_info }, > + { "find_stream_info", OPT_BOOL | OPT_PERFILE | OPT_INPUT | OPT_EXPERT | OPT_OFFSET, > + { .off = OFFSET(find_stream_info) }, You can drop OPT_PERFILE, since it's implied by OPT_OFFSET. Otherwise patch LGTM, I'll do the change myself and push if you don't object. -- Anton Khirnov _______________________________________________ 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".