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 6AEBA48658 for ; Wed, 13 Dec 2023 11:33:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6943C68D106; Wed, 13 Dec 2023 13:33:46 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6090668D062 for ; Wed, 13 Dec 2023 13:33:39 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BDC8F2405ED; Wed, 13 Dec 2023 12:33:38 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 7kTIH-bqrizH; Wed, 13 Dec 2023 12:33:38 +0100 (CET) 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 279742400AC; Wed, 13 Dec 2023 12:33:38 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id F0B2F1601B9; Wed, 13 Dec 2023 12:33:31 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20231109122534.124157-16-ffmpeg@haasn.xyz> References: <20231109122534.124157-1-ffmpeg@haasn.xyz> <20231109122534.124157-16-ffmpeg@haasn.xyz> Mail-Followup-To: FFmpeg development discussions and patches , Niklas Haas Date: Wed, 13 Dec 2023 12:33:31 +0100 Message-ID: <170246721196.8914.4820634411198865037@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 15/25] avfilter/vf_format: add color_ranges/spaces 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: Niklas Haas 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 Niklas Haas (2023-11-09 13:19:47) > From: Niklas Haas > > Needed for fftools/ffmpeg_filter to be able to force specific output > formats via the filter chain. > --- > doc/filters.texi | 8 ++++++++ > libavfilter/vf_format.c | 44 +++++++++++++++++++++++++++++++++++++---- > 2 files changed, 48 insertions(+), 4 deletions(-) > > diff --git a/doc/filters.texi b/doc/filters.texi > index 55a333680c..4599d575a6 100644 > --- a/doc/filters.texi > +++ b/doc/filters.texi > @@ -14241,6 +14241,14 @@ It accepts the following parameters: > A '|'-separated list of pixel format names, such as > "pix_fmts=yuv420p|monow|rgb24". > > +@item color_spaces > +A '|'-separated list of color space names, such as > +"color_spaces=bt709|bt470bg|bt2020nc". > + > +@item color_ranges > +A '|'-separated list of color rangee names, such as ^ extra e > +"color_spaces=tv|pc". > + > @end table > > @subsection Examples > diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c > index b137e3075e..d1bb9daa97 100644 > --- a/libavfilter/vf_format.c > +++ b/libavfilter/vf_format.c > @@ -40,18 +40,24 @@ > typedef struct FormatContext { > const AVClass *class; > char *pix_fmts; > + char *csps; > + char *ranges; > > AVFilterFormats *formats; ///< parsed from `pix_fmts` > + AVFilterFormats *color_spaces; ///< parsed from `csps` > + AVFilterFormats *color_ranges; ///< parsed from `ranges` > } FormatContext; > > static av_cold void uninit(AVFilterContext *ctx) > { > FormatContext *s = ctx->priv; > ff_formats_unref(&s->formats); > + ff_formats_unref(&s->color_spaces); > + ff_formats_unref(&s->color_ranges); > } > > static av_cold int invert_formats(AVFilterFormats **fmts, > - AVFilterFormats *allfmts) > + AVFilterFormats *allfmts) > { > if (!allfmts) > return AVERROR(ENOMEM); > @@ -99,13 +105,35 @@ static av_cold int init(AVFilterContext *ctx) > return ret; > } > > + for (char *sep, *cur = s->csps; cur; cur = sep) { > + sep = strchr(cur, '|'); > + if (sep && *sep) > + *sep++ = 0; > + if ((ret = av_color_space_from_name(cur)) < 0 || > + (ret = ff_add_format(&s->color_spaces, ret)) < 0) I find this style of assigning inside a condition far more error-prone and harder to read. Especially when you have three of them in a single if() below. Otherwise looks ok. -- 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".