From patchwork Wed Aug 10 20:47:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 37221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1142316pzi; Wed, 10 Aug 2022 13:47:59 -0700 (PDT) X-Google-Smtp-Source: AA6agR5cBEJd5fBu3MSKX9bXG51j6TnnW4uRLopeGH8pXwEDuXS59O5Plb0V5lCKe47zt9M1+2L2 X-Received: by 2002:a05:6402:3222:b0:43e:49f9:11e with SMTP id g34-20020a056402322200b0043e49f9011emr28467937eda.426.1660164478925; Wed, 10 Aug 2022 13:47:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660164478; cv=none; d=google.com; s=arc-20160816; b=hQOXoIz2krlf1WFqayZDC6vl+zzKrzcLgcRw61xLveREkD4UtkDcIiZhfwh9ipO3yj Eg/baJEA88CNtcWPHAOkIXqEB0zy3SGy9SI+NrevPMz2DpxNsPBqTsDezocRHkYO+qzR Q5xfqjeZo72xpMlv2kcyHWTYGklwBMc555GXuqJfICruKESEGqTa4/SBahjbPOz7U1G/ /3Ltzd7xgZaxGQyd2IcSeVdxLmW53x/qLjGfH8dfLinuDlRfTJ8sGcW8WGJGylKZrSGn BSBPkhdfpy8OSiQ8+C2SbBzlLjSHCsQ/hlYNSjfZdEkPaVW9SrVUTEr6S0Qs1wpRozf/ 8sRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=+nA1E43S6UHMMQw5GuN4plOv1+Ui3YVsz2SrK6mWORs=; b=YK3IKWiSXqDQzowl9dpraBUv94HgYZcrRKSKtGmVn+x6Jq1gFQJ/IviatLaOzCHc4u kDLTnxaRHYOwIUWXe7yXiV/BDSv+Qerv8v3n8DVmr084BiDQOVqoqhsYfgm5PyHSQtRt lr9jf5OMWlZ3Rk0JQ/r63niMru9YuN00cwTmennzWJlvhxkSH28TzIExQuP4YvPIINM2 05a4alj8FgndPs5Th2SAwTdXuJKlGrwoCXWzUE+QgSc3tC413iKZ5RxgmwLDt89S7Vya VzXmrfhASnXCBuTCl0JoQT5BdQsbKnx4AtkKYsN5YZ+gynw/ukRno2WYHpnfGFlZzoQm NETA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b="eeSQJw/v"; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g24-20020a50ee18000000b00440253e1144si10503743eds.277.2022.08.10.13.47.58; Wed, 10 Aug 2022 13:47:58 -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; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b="eeSQJw/v"; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F67368B1E1; Wed, 10 Aug 2022 23:47:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B10DA68B7F3 for ; Wed, 10 Aug 2022 23:47:25 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id B0FD02F2605; Wed, 10 Aug 2022 22:47:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1660164444; bh=4TnNCQ+Ql+0myt0HXWahMYmNY2bdj3sCoKj011c1T1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eeSQJw/vWwrBPYmIWw5OVX3eezpxKWFyzFFDY1g2XGQMxg27hXl/2zqja1AaCKxxc nQvm4REUWAQCoBBrz2nks7ndNWTGgDKz9FFwgkfUo8OLZFgA7/x+y5QLA/fjWIGon6 o7DlMFzl821bFJP/aAWJjXo5FwweJHrXHoYTEW5VanOJylW+RE2nJtn+oLBwQjjySJ ghHVQS6JxVuQB2sNKuqQR3CH+DVprdVdCLC4eVYylNV3hL+6apUZlU8YdLbBZv3MH7 InX4mRi8ySOjMAQeKbweatDL3Pr2Ma5VkOWsZBOLLcLYi+BLu2k2fzYeHToKwXtoFE k03gGgqtKWItw== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 22:47:04 +0200 Message-Id: <20220810204712.3123-3-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220810204712.3123-1-timo@rothenpieler.org> References: <20220810204712.3123-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/11] avfilter/vsrc_ddagrab: add rgbaf16 output support 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: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /5o+RL/FtKzO --- libavfilter/version.h | 2 +- libavfilter/vsrc_ddagrab.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libavfilter/version.h b/libavfilter/version.h index 19a009c110..fa67606495 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 101 +#define LIBAVFILTER_VERSION_MICRO 102 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vsrc_ddagrab.c b/libavfilter/vsrc_ddagrab.c index ce36716281..252505b96d 100644 --- a/libavfilter/vsrc_ddagrab.c +++ b/libavfilter/vsrc_ddagrab.c @@ -115,6 +115,8 @@ static const AVOption ddagrab_options[] = { { "bgra", "only output 8 Bit BGRA", 0, AV_OPT_TYPE_CONST, { .i64 = DXGI_FORMAT_B8G8R8A8_UNORM }, 0, INT_MAX, FLAGS, "output_fmt" }, { "10bit", "only output default 10 Bit format", 0, AV_OPT_TYPE_CONST, { .i64 = DXGI_FORMAT_R10G10B10A2_UNORM }, 0, INT_MAX, FLAGS, "output_fmt" }, { "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" }, { NULL } }; @@ -212,6 +214,7 @@ static av_cold int init_dxgi_dda(AVFilterContext *avctx) if (set_thread_dpi && SUCCEEDED(hr)) { DPI_AWARENESS_CONTEXT prev_dpi_ctx; DXGI_FORMAT formats[] = { + DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM }; @@ -665,6 +668,10 @@ static av_cold int init_hwframes_ctx(AVFilterContext *avctx) av_log(avctx, AV_LOG_VERBOSE, "Probed 10 bit RGB frame format\n"); dda->frames_ctx->sw_format = AV_PIX_FMT_X2BGR10; break; + case DXGI_FORMAT_R16G16B16A16_FLOAT: + av_log(avctx, AV_LOG_VERBOSE, "Probed 16 bit float RGB frame format\n"); + dda->frames_ctx->sw_format = AV_PIX_FMT_RGBAF16; + break; default: av_log(avctx, AV_LOG_ERROR, "Unexpected texture output format!\n"); return AVERROR_BUG; @@ -990,6 +997,12 @@ static int ddagrab_request_frame(AVFilterLink *outlink) frame->color_primaries = AVCOL_PRI_BT709; frame->color_trc = AVCOL_TRC_IEC61966_2_1; frame->colorspace = AVCOL_SPC_RGB; + } else if(desc.Format == DXGI_FORMAT_R16G16B16A16_FLOAT) { + // According to MSDN, all floating point formats contain sRGB image data with linear 1.0 gamma. + frame->color_range = AVCOL_RANGE_JPEG; + frame->color_primaries = AVCOL_PRI_BT709; + frame->color_trc = AVCOL_TRC_LINEAR; + frame->colorspace = AVCOL_SPC_RGB; } else { ret = AVERROR_BUG; goto fail;