From patchwork Tue Jan 31 08:41:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 40186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp4048000pzj; Tue, 31 Jan 2023 00:45:28 -0800 (PST) X-Google-Smtp-Source: AK7set+O6R88H0TlwpVr9LGanq2ZWkfrpu9snNM5XRUCy9Bg5IwsTnmdPHiE5mxWDSMefqz2ySrX X-Received: by 2002:a05:6402:254a:b0:49e:6a70:d9a6 with SMTP id l10-20020a056402254a00b0049e6a70d9a6mr2975563edb.25.1675154728518; Tue, 31 Jan 2023 00:45:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675154728; cv=none; d=google.com; s=arc-20160816; b=h4Y6BhuL5QXcXNYYKbOahnlgvWBjctHjik8gX/PwexopGNf5g8g+xS6LRb6tF/eB6c mJBDiVSPXUaoSLDhM7JW+OPPGgNc/6Rgy2eSaiXb012SfqCpXvbEneMJWWp/38O0SySN LAFqTQWiY48N0VdFO/z0aJnLM1jsB6AvGA57tKf+LFMbE/5JswnxhX/ZtNDUvdv/YxOB 4MRBaaJqBPK5TFSMTEAcEAARD9xHhWnB55WjicpZRE7kgCTrlJqDffLO1M7465ACQ8hW je2DrWRP1BAkUXUXWNWdu5HnTlJKz5engJsyRBKPiGVmNLbO0Es0N0ysk4d3R9AB1Qd0 b6Ig== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=0Wz9YP6ertP9gKf1esEA9REEydDm1Kh/j60l9V7ZTeQ=; b=nOfGdjOvcIeyXAI3gqAZqm0bzwfQmumveIUE4NiAv0gCpOurGFgAQhlVUGqBMHcDXB hfand3NpE4ccltaONclp//Bwdwklt4hpeclFLYl2GHQS73sbOxpjB8ky9+oYO6nvLDjS rE1Ur/SPn61dJA/CjOP5D441a/FfrS2s9uY5gAgAXpwUThHLmrpS43OtqTIKU/V/ynBW XA8m40TRmaTUcb8+p6OuH5+bZSgZbcDJ67MHh2crKGScJ12qAcATihCyVfyTMlhQjHMh /Saag6IH6RIMQzai+otrrwmcobfC3WJzF4VH7gHD2f6ydxuAtFfs3ZR8DmvXcab2oQGi Lm8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=bdqADuow; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cz27-20020a0564021cbb00b0049e76c617c5si16125053edb.253.2023.01.31.00.45.03; Tue, 31 Jan 2023 00:45:28 -0800 (PST) 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=@intel.com header.s=Intel header.b=bdqADuow; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C417568BE16; Tue, 31 Jan 2023 10:44:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3966868BDB2 for ; Tue, 31 Jan 2023 10:44:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675154687; x=1706690687; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=BVBDDdrZjobu5DvPGDi4eFxhVEfV6PUpTIsmevZF0JM=; b=bdqADuowP5eSh1f13SdmbAMtK30CU53YoXXzOSoYLy/tlvlk/DYlL6bv 6SoVqK/s9zDkZYGvIeE+ealG1BPbR7BM8Cue2NHvPdDCqOe21CJb1XJMD Za6MQm+Fyh7hzB35xtmq5d7njCm8yih90orDpwyWQrjiqzQdNX6USBcDJ wou+EcSuG8//a1uE8ksgEtC1EVm4o+4ai+7E9D6DvHcMUq7Hz1b0hlxJI l9iAVfxorJEStWN8kENkyj+CPvEHw3dql7uWMYhTZOyZOydCCyAsEeoOA a2iYVvXZgGuiEGylvwoUjtydftncwykziwIpnUk9avo6d8BBdnnUGLAca Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="414003299" X-IronPort-AV: E=Sophos;i="5.97,259,1669104000"; d="scan'208";a="414003299" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2023 00:44:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="664421000" X-IronPort-AV: E=Sophos;i="5.97,259,1669104000"; d="scan'208";a="664421000" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga002.jf.intel.com with ESMTP; 31 Jan 2023 00:44:39 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Jan 2023 16:41:24 +0800 Message-Id: <20230131084126.613-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1.windows.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] hwcontext_d3d11va: add mutiple supported DXGI formats 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OQ/4rm2WqhUa Add support for VUYX, YUYV422, Y210, XV30, P012, Y212, XV36. The added formats work with qsv acceleration and will not have impact on d3d11va acceleration(-hwaccel d3d11va) since so far these formats are still not supported by using d3d11va acceleration. Signed-off-by: Tong Wu --- libavutil/hwcontext_d3d11va.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 363ec6a47d..aa50538d64 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -89,6 +89,13 @@ static const struct { { DXGI_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_BGRA }, { DXGI_FORMAT_R10G10B10A2_UNORM, AV_PIX_FMT_X2BGR10 }, { DXGI_FORMAT_R16G16B16A16_FLOAT, AV_PIX_FMT_RGBAF16 }, + { DXGI_FORMAT_AYUV, AV_PIX_FMT_VUYX }, + { DXGI_FORMAT_YUY2, AV_PIX_FMT_YUYV422 }, + { DXGI_FORMAT_Y210, AV_PIX_FMT_Y210 }, + { DXGI_FORMAT_Y410, AV_PIX_FMT_XV30 }, + { DXGI_FORMAT_P016, AV_PIX_FMT_P012 }, + { DXGI_FORMAT_Y216, AV_PIX_FMT_Y212 }, + { DXGI_FORMAT_Y416, AV_PIX_FMT_XV36 }, // Special opaque formats. The pix_fmt is merely a place holder, as the // opaque format cannot be accessed directly. { DXGI_FORMAT_420_OPAQUE, AV_PIX_FMT_YUV420P }, From patchwork Tue Jan 31 08:41:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 40187 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp4048001pzj; Tue, 31 Jan 2023 00:45:28 -0800 (PST) X-Google-Smtp-Source: AK7set+utNWrZh8NwOHe0ZX3fvprFkRt4bC2wjktg7UGgfs+kAv0OjBSDn5NGfx9lXyOJ96x38WJ X-Received: by 2002:a05:6402:5173:b0:4a1:2b1e:8292 with SMTP id d19-20020a056402517300b004a12b1e8292mr17640882ede.20.1675154728517; Tue, 31 Jan 2023 00:45:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675154728; cv=none; d=google.com; s=arc-20160816; b=oCfQk95yCBqAk9PG8O7mwly0iHadHtRi9xDY5WQ3+He/zGi2CI2+5WSEYP3g9g2oG1 5Mas4pSJvzxZgjvlXjrKDqDnGtJq9UfJp1a9PG/3vVaDGjDJQh+hGmaAKhOLhyFG9XDE Odrq4pEglPTgsGt8ZK3n/ai3Csj4i3WvNMgV1nZaILEYI3tHkIV9ZNZouGoAdXzDHjfv s736i23IDkOK+j5QnV2Np8NKcf/saUi2XKkPBm67xhp3sGyy1upZapgtb+eSqKrIsuXL z3USLAev0S+QwFyNOXhJZXxRh3MdsN95ptweDGRH/IUmUxrgXI1WzCYI7T7E+KqsiCzL mAow== 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=ix+EZMoyT1FgAjl5uvY6cPZoNwOPENZzFyUn1XIWDMQ=; b=gdpd50FseXIo4V98FuGIjLiJwLhv4tYQUwpEKD+WTEbOfPsXlov75Izd8oT0L3MljZ Y6/Q7yfx1J1+0E3UP+S3TJrlRhPnSH4qijM1L3iYd2Btog1mxIMxSgrXzSXwudA8cM4g Hc6XeLnczLwFSnpj246b9UTCriR8avZkb6vVT5g2SoON6syAuyUMwOH8P6g9kYW+oUSz igi6Ej8cEv45Xq5csVFZc8/+rCGhWxnKY93VmZ4XQjS+E8v7QtSjEOtnaG/voB8hSHj/ EZklLz+P6RDd31qXuKHERKVkjbUv3Univir7pFrs2LIfkK/w03/OdcQbhusZUORgPl4m QmYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=c1sIj05+; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f14-20020a056402194e00b004a25cf9951dsi3588201edz.554.2023.01.31.00.45.06; Tue, 31 Jan 2023 00:45:28 -0800 (PST) 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=@intel.com header.s=Intel header.b=c1sIj05+; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC85E68BE00; Tue, 31 Jan 2023 10:44:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0E4C68B8D2 for ; Tue, 31 Jan 2023 10:44:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675154688; x=1706690688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=48e+7Zpnm/eKT7NuBTrXLrgz33/AcQo/XM3eVdy23yU=; b=c1sIj05+lqp+4wAFv/lJEt+l1ZqkQlcqaz2VDFcUu1HX9UVSqx3UISpr TpapLKooyZvvMvIy9JSXpnAGRAhd32/suVSmWzkZHhh7dFnEpFvVUDLS8 eLC87pLRrwJW7W0D6t5gTyf/gVF0aRu6lyTUDn+D+tbu9XgeKxAkLaO8i Ok/2HK4w7cVU4LkfQGVFgWyTxOUREZjQJer9kAPL+dVGwwuX/3gUMuUuM /l+0CUA7QRs9hEnoLo4R/4UXhDP9LCh3VvKo5CYa2+VhPIr7lyoTW6A9P 3nCqaHyrH/3gLWPUxviQG8t8XOCwrSIXkue/RN0VvkvLGCvvKX/8dFg7u A==; X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="414003301" X-IronPort-AV: E=Sophos;i="5.97,259,1669104000"; d="scan'208";a="414003301" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2023 00:44:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="664421005" X-IronPort-AV: E=Sophos;i="5.97,259,1669104000"; d="scan'208";a="664421005" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga002.jf.intel.com with ESMTP; 31 Jan 2023 00:44:40 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Jan 2023 16:41:25 +0800 Message-Id: <20230131084126.613-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1.windows.2 In-Reply-To: <20230131084126.613-1-tong1.wu@intel.com> References: <20230131084126.613-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] hwcontext_dxva2: add mutiple supported formats 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BI+RMgswaJdA Add support for VUYX, YUYV422, Y210, XV30, P012, Y212, XV36. The added formats work with qsv acceleration and will not have impact on dxva2 acceleration(-hwaccel dxva2) since so far these formats are still not supported by using dxva2 acceleration. Signed-off-by: Tong Wu --- libavutil/hwcontext_dxva2.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index 53d00fa815..ea378df720 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -82,6 +82,13 @@ static const struct { } supported_formats[] = { { MKTAG('N', 'V', '1', '2'), AV_PIX_FMT_NV12 }, { MKTAG('P', '0', '1', '0'), AV_PIX_FMT_P010 }, + { MKTAG('A', 'Y', 'U', 'V'), AV_PIX_FMT_VUYX }, + { MKTAG('Y', 'U', 'Y', '2'), AV_PIX_FMT_YUYV422 }, + { MKTAG('Y', '2', '1', '0'), AV_PIX_FMT_Y210 }, + { MKTAG('Y', '4', '1', '0'), AV_PIX_FMT_XV30 }, + { MKTAG('P', '0', '1', '6'), AV_PIX_FMT_P012 }, + { MKTAG('Y', '2', '1', '6'), AV_PIX_FMT_Y212 }, + { MKTAG('Y', '4', '1', '6'), AV_PIX_FMT_XV36 }, { D3DFMT_P8, AV_PIX_FMT_PAL8 }, { D3DFMT_A8R8G8B8, AV_PIX_FMT_BGRA }, }; From patchwork Tue Jan 31 08:41:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 40188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp4048085pzj; Tue, 31 Jan 2023 00:45:38 -0800 (PST) X-Google-Smtp-Source: AK7set/wQp1+6+642cSeu5KAkUB4Fkszlr+eguEnc/MAVcsml3ndY8Oza8Jz17/H0NwfPJ2c7oyc X-Received: by 2002:aa7:d30f:0:b0:4a2:46f3:467e with SMTP id p15-20020aa7d30f000000b004a246f3467emr7114716edq.30.1675154738419; Tue, 31 Jan 2023 00:45:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675154738; cv=none; d=google.com; s=arc-20160816; b=AFL8WwGjxg1xVNQY5bDevB5DmX01+MRl87N+eQPmswjtgDVd0ncsHjMpZlypo8mhik zsD9tWdwyILEOthZNdP0f0DpU+BvZB9voopiS+S4hb/hpPo0MoFG/Ox03Dc3XAMqP0Iz T7FJm+N6TB/H9fWe70Lvl84jT9st+X0N8tKE9Lh6dnQrb2tFlTsKBPvHv4glyiB9Ngui mtm3Quc4LacA3NsElp9E4tTtag5O0k/UD0LMKT7LNqLq94s72TssQfgLy8w2EjhNnYAj iqAMc4AIYy7gWqMzvnA/JblBODQiI1HjFWeRqr2T6qRDRc/q0OoU2LVShFO9ZThjWf2s bYXA== 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=LXd17slXghuDluJnLn712mh9i8TH/cOqRXUeRbSBvyk=; b=vsFTTv6pcOGOvcSJYKc1W+1O4RFKVOOAimcO2TJPPohXVo6MuGMnQNfsQa21iATqBJ 20inFNDBXjdEMu4vWOWyFXjJODU06yKI5q4CFOKXzHCl7L+lZ0Dyvg0qM/HaHSw8X05I +VgPY94XULxujD64a96+IZA3Bk40/dwyW9ZDcAKp7iKbl2D+rkB5vyKmVMKaiZOizlEN 9zcLIYXEjnx8RGgdiBlMegj16+mxpa86SCgZfv3krnxweDJTIy/eaP6g9NBG45zpuQdb zV2VkvBTDX4NRZyIlHt0xKCaMHYqUm6XQJqOQ5kfIfJ5xhdIZxUuz/8H0oVsvd758rzc bCDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kJBLFbvJ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r5-20020a170906a20500b007309e8d567fsi18503701ejy.145.2023.01.31.00.45.17; Tue, 31 Jan 2023 00:45:38 -0800 (PST) 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=@intel.com header.s=Intel header.b=kJBLFbvJ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED3D568BE2D; Tue, 31 Jan 2023 10:44:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 200BF68BE19 for ; Tue, 31 Jan 2023 10:44:47 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675154693; x=1706690693; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+VJCShEMJ8PJENOYRj0d7zHoDaavjSiuSWJdko7fcPM=; b=kJBLFbvJFknMDl93YKVTd9G44H8sOAs2wikGVjkstkkgMeHfxMQ0T0UZ welkMd8/QmDRlkQAZQCL0MT4LkR6MXH6DUnHaX1SQxZepu2TTy8AdVsN5 cuLrSW00ipioqGApyVNMrlHmEq4ygJjtIP1kPvXVRqpX1m0EyRxcmYT3b 91lPrOQRV79Ub67MUNZIRp1JI87QSI8XR9jRd+OimODL9ZmQqZjRfUfTI 8isiHKxuJeo11oUi7fezT9c5ILMvFOcyUT9p03G2iiGk2Bi3m5l/6yXlY IES73BzYQzuIzZ+M6PEnIhbWsSFmGSK3eZL/Vh888EVgI8i//AoEsU6T6 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="414003303" X-IronPort-AV: E=Sophos;i="5.97,259,1669104000"; d="scan'208";a="414003303" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2023 00:44:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10606"; a="664421010" X-IronPort-AV: E=Sophos;i="5.97,259,1669104000"; d="scan'208";a="664421010" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga002.jf.intel.com with ESMTP; 31 Jan 2023 00:44:41 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Jan 2023 16:41:26 +0800 Message-Id: <20230131084126.613-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1.windows.2 In-Reply-To: <20230131084126.613-1-tong1.wu@intel.com> References: <20230131084126.613-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] qsv: remove CONFIG_VAAPI 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CNsu9tDD49Up Make 8-bit, 10-bit, 12-bit YUV 4:2:2 video sources as well as YUV 4:4:4 video sources supported by d3d11va and dxva2 just like what VAAPI does. Sign-off-by: Tong Wu --- libavcodec/qsv.c | 4 ---- libavutil/hwcontext_qsv.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 7af154202c..8eabf46b45 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -208,7 +208,6 @@ enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc) case MFX_FOURCC_P8: return AV_PIX_FMT_PAL8; case MFX_FOURCC_A2RGB10: return AV_PIX_FMT_X2RGB10; case MFX_FOURCC_RGB4: return AV_PIX_FMT_BGRA; -#if CONFIG_VAAPI case MFX_FOURCC_YUY2: return AV_PIX_FMT_YUYV422; case MFX_FOURCC_Y210: return AV_PIX_FMT_Y210; case MFX_FOURCC_AYUV: return AV_PIX_FMT_VUYX; @@ -217,7 +216,6 @@ enum AVPixelFormat ff_qsv_map_fourcc(uint32_t fourcc) case MFX_FOURCC_P016: return AV_PIX_FMT_P012; case MFX_FOURCC_Y216: return AV_PIX_FMT_Y212; case MFX_FOURCC_Y416: return AV_PIX_FMT_XV36; -#endif #endif } return AV_PIX_FMT_NONE; @@ -245,7 +243,6 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc, uint16_t *shi *fourcc = MFX_FOURCC_RGB4; *shift = 0; return AV_PIX_FMT_BGRA; -#if CONFIG_VAAPI case AV_PIX_FMT_YUV422P: case AV_PIX_FMT_YUYV422: *fourcc = MFX_FOURCC_YUY2; @@ -277,7 +274,6 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc, uint16_t *shi *fourcc = MFX_FOURCC_Y416; *shift = 1; return AV_PIX_FMT_XV36; -#endif #endif default: return AVERROR(ENOSYS); diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index ec0f72b329..ba0ac8cda5 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -115,7 +115,6 @@ static const struct { { AV_PIX_FMT_BGRA, MFX_FOURCC_RGB4, 0 }, { AV_PIX_FMT_P010, MFX_FOURCC_P010, 1 }, { AV_PIX_FMT_PAL8, MFX_FOURCC_P8, 0 }, -#if CONFIG_VAAPI { AV_PIX_FMT_YUYV422, MFX_FOURCC_YUY2, 0 }, { AV_PIX_FMT_Y210, @@ -142,7 +141,6 @@ static const struct { { AV_PIX_FMT_XV36, MFX_FOURCC_Y416, 1 }, #endif -#endif }; extern int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf, @@ -1524,7 +1522,6 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) surface->Data.R = frame->data[0] + 2; surface->Data.A = frame->data[0] + 3; break; -#if CONFIG_VAAPI case AV_PIX_FMT_YUYV422: surface->Data.Y = frame->data[0]; surface->Data.U = frame->data[0] + 1; @@ -1556,7 +1553,6 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) // use the value from the frame. surface->Data.A = frame->data[0] + 6; break; -#endif default: return MFX_ERR_UNSUPPORTED; }