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 3944441066 for ; Sat, 13 Aug 2022 13:52:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B6E668B7EB; Sat, 13 Aug 2022 16:52:09 +0300 (EEST) Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4485F68B178 for ; Sat, 13 Aug 2022 16:52:02 +0300 (EEST) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4M4hmb57N6z9sQT for ; Sat, 13 Aug 2022 15:51:59 +0200 (CEST) Message-ID: <47d1fcb3-44bf-ff78-1794-b0b20ef85fdc@gyani.pro> Date: Sat, 13 Aug 2022 19:21:50 +0530 MIME-Version: 1.0 Content-Language: en-US To: FFmpeg development discussions and patches References: <20220813133523.0699C410513@natalya.videolan.org> From: Gyan Doshi In-Reply-To: <20220813133523.0699C410513@natalya.videolan.org> X-Rspamd-Queue-Id: 4M4hmb57N6z9sQT Subject: Re: [FFmpeg-devel] [FFmpeg-cvslog] avfilter/vsrc_ddagrab: add options for more control over output format fallback 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 2022-08-13 07:05 pm, Timo Rothenpieler wrote: > ffmpeg | branch: master | Timo Rothenpieler | Sun Aug 7 23:14:09 2022 +0200| [c469c3c3b18fbacd6ee0165573034d2a0408b83f] | committer: Timo Rothenpieler > > avfilter/vsrc_ddagrab: add options for more control over output format fallback > >> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c469c3c3b18fbacd6ee0165573034d2a0408b83f > --- > > libavfilter/version.h | 2 +- > libavfilter/vsrc_ddagrab.c | 12 +++++++++--- doc/filters.texi update needed. Regards, Gyan > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/libavfilter/version.h b/libavfilter/version.h > index fa67606495..f3c1964cac 100644 > --- a/libavfilter/version.h > +++ b/libavfilter/version.h > @@ -32,7 +32,7 @@ > #include "version_major.h" > > #define LIBAVFILTER_VERSION_MINOR 46 > -#define LIBAVFILTER_VERSION_MICRO 102 > +#define LIBAVFILTER_VERSION_MICRO 103 > > > #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ > diff --git a/libavfilter/vsrc_ddagrab.c b/libavfilter/vsrc_ddagrab.c > index 252505b96d..00c72187ea 100644 > --- a/libavfilter/vsrc_ddagrab.c > +++ b/libavfilter/vsrc_ddagrab.c > @@ -98,6 +98,8 @@ typedef struct DdagrabContext { > int offset_x; > int offset_y; > int out_fmt; > + int allow_fallback; > + int force_fmt; > } DdagrabContext; > > #define OFFSET(x) offsetof(DdagrabContext, x) > @@ -117,6 +119,10 @@ static const AVOption ddagrab_options[] = { > { "x2bgr10", "only output 10 Bit X2BGR10", 0, AV_OPT_TYPE_CONST, { .i64 = DXGI_FORMAT_R10G10B10A2_UNORM }, 0, INT_MAX, FLAGS, "output_fmt" }, > { "16bit", "only output default 16 Bit format", 0, AV_OPT_TYPE_CONST, { .i64 = DXGI_FORMAT_R16G16B16A16_FLOAT },0, INT_MAX, FLAGS, "output_fmt" }, > { "rgbaf16", "only output 16 Bit RGBAF16", 0, AV_OPT_TYPE_CONST, { .i64 = DXGI_FORMAT_R16G16B16A16_FLOAT },0, INT_MAX, FLAGS, "output_fmt" }, > + { "allow_fallback", "don't error on fallback to default 8 Bit format", > + OFFSET(allow_fallback), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, > + { "force_fmt", "exclude BGRA from format list (experimental, discouraged by Microsoft)", > + OFFSET(force_fmt), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, > { NULL } > }; > > @@ -226,7 +232,7 @@ static av_cold int init_dxgi_dda(AVFilterContext *avctx) > } else if (dda->out_fmt) { > formats[0] = dda->out_fmt; > formats[1] = DXGI_FORMAT_B8G8R8A8_UNORM; > - nb_formats = 2; > + nb_formats = dda->force_fmt ? 1 : 2; > } > > IDXGIOutput_Release(dxgi_output); > @@ -262,7 +268,7 @@ static av_cold int init_dxgi_dda(AVFilterContext *avctx) > #else > { > #endif > - if (dda->out_fmt && dda->out_fmt != DXGI_FORMAT_B8G8R8A8_UNORM) { > + if (dda->out_fmt && dda->out_fmt != DXGI_FORMAT_B8G8R8A8_UNORM && (!dda->allow_fallback || dda->force_fmt)) { > av_log(avctx, AV_LOG_ERROR, "Only 8 bit output supported with legacy API\n"); > return AVERROR(ENOTSUP); > } > @@ -733,7 +739,7 @@ static int ddagrab_config_props(AVFilterLink *outlink) > if (ret < 0) > return ret; > > - if (dda->out_fmt && dda->raw_format != dda->out_fmt) { > + if (dda->out_fmt && dda->raw_format != dda->out_fmt && (!dda->allow_fallback || dda->force_fmt)) { > av_log(avctx, AV_LOG_ERROR, "Requested output format unavailable.\n"); > return AVERROR(ENOTSUP); > } > > _______________________________________________ > ffmpeg-cvslog mailing list > ffmpeg-cvslog@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog > > To unsubscribe, visit link above, or email > ffmpeg-cvslog-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ 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".