From patchwork Tue Feb 7 06:36:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 40308 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp4033559pzk; Mon, 6 Feb 2023 22:40:26 -0800 (PST) X-Google-Smtp-Source: AK7set9hmY8b46RB/QEz9DiftnwEEPhaE59Lvkhm00Zmuj5VxrQA6uQN6uwgmLxNrU3KbbsxsSZE X-Received: by 2002:a17:906:f9d6:b0:8aa:9822:7ef with SMTP id lj22-20020a170906f9d600b008aa982207efmr105026ejb.41.1675752026074; Mon, 06 Feb 2023 22:40:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675752026; cv=none; d=google.com; s=arc-20160816; b=sSdp7XnLpEQxlI7tS4cQBI25MDpYxfSSDxICqh1VrCk1gY+BWJ7w+bSZpAbO+7mX+T 0aoTvWdjdM16xPTE2jDToMyz+SNTqMd976i9U/mZZCFhlNV63LoZZVn5RtUcV13z+F4M 682r5WN9+khdpzhberwgo7QUBl2TjWQoTC96ujR00OVkVf8r52pA8OFqRIgCe+lB/cKy ICWwYpFNqOjQgUhrcN+o440k9H7xJGNnZnKHMBUOLk/PkIB0vZiZxxvV9ch9Jrb8y1oC YNdXocgzStqGYJsg/BVtg/6+sy5c3Bgw8fYRKV9n/hHA8NliEX1RahSpcI/zoNprJxIG BFKA== 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=67/dGV6YVGb5Q6PvKOc8jiHrrDBLWbTu48a8pcPpKBE=; b=Kz9porHDCTfb71Sl2NqRnblOb2HztX30IP3K3DopRo8fhqJBTjjJI3jL9m8b/L3dCi bUew9OjBCRRDb10xqYWQm9LBa/K0yUchfiLzYUh/PrnvWpt0sKrRR/EqT84iIWSO3EQz y/C/X43OHE4vKDVjzs5Larkrv/5H7cMWqx2EGMW184n685GwZ2oGChW1e2DJ6T3Wo6hb nOTML4+yGBmqAx4kqYrK2CEDJcspcU4HThZ0Vh8Nt/miYI0lbEP1a+Frbmb02Ux+bzHZ FZ3v62emy+LVLf9nWqp1kBqxhAb7Y7q8S+h+Fn+QEd+iWOC5s9a8meTU3KfIdQQY2y84 x0NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=UlfEDGNL; 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 gk5-20020a17090790c500b0087bd629e9dcsi14248739ejb.173.2023.02.06.22.40.25; Mon, 06 Feb 2023 22:40:26 -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=UlfEDGNL; 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 1AFFA68BBB1; Tue, 7 Feb 2023 08:40:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EFF968BE75 for ; Tue, 7 Feb 2023 08:40:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675752019; x=1707288019; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xWIjOyRaA6drU1+hGUaHb6Eu+qHcGZtR+ovWA3zPGrk=; b=UlfEDGNLEsufXIgoIyoF2eza/ucV9JwtMVzDS15ldaSpoAKZgTKdFIcj UiNMnAGCtKVAN8zKucVnerWMHn/I4HwXRMklRylKQ/pcUf3eWrN/GanMa O6udulDLTs7F7SJNH4vkFmv0Rf+aFjzN2WAA9TP0e9DO6P/5C5v3UXqzU 3nuTD0/C84/N3HBs3SPEitCD5YdtM8KAMhwArevQCNDHCaCpGWrwVS5wE +RJqmecfF1Wp1rlIRI4rPkgxb4WjTJ3h6ile2dVYq5DbGm74lH7FU+q+N Lpi3qChQztsJiKweWjURHtb6hsn1kjvKZvmqwBJDdHnUFpAXY4rNFR34H A==; X-IronPort-AV: E=McAfee;i="6500,9779,10613"; a="327108238" X-IronPort-AV: E=Sophos;i="5.97,278,1669104000"; d="scan'208";a="327108238" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2023 22:40:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10613"; a="697145763" X-IronPort-AV: E=Sophos;i="5.97,278,1669104000"; d="scan'208";a="697145763" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga008.jf.intel.com with ESMTP; 06 Feb 2023 22:40:09 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Feb 2023 14:36:59 +0800 Message-Id: <20230207063701.1106-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.39.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: fDCVDiWhS97M 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. Hwupload and hwdownload can work with the added formats. 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 Feb 7 06:37:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 40309 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp4033635pzk; Mon, 6 Feb 2023 22:40:35 -0800 (PST) X-Google-Smtp-Source: AK7set/mARecLAuRDNoGoI+a338hjhoR3uDIxz0ZMZ66gO9ohCcpo+QAY1cAxH44K/Pk6yP+Z5QV X-Received: by 2002:a17:906:d28e:b0:878:7449:429f with SMTP id ay14-20020a170906d28e00b008787449429fmr2214039ejb.16.1675752035186; Mon, 06 Feb 2023 22:40:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675752035; cv=none; d=google.com; s=arc-20160816; b=afnDz+w8rK7a8yhkqDWcmfszu+o7Ih+u6zkhMnUYHoVIRROFtvO/Z27dOCTvluBKj3 Ur/Q70LVfwy1pQ1M1X8oRne0SvSte+qgTpiSoRxpTinhxAqplBYyMNSUq2p9YfGsN3b4 Tpy7e0BGebSZyAwdkfGGLJ16ttauI/OHt2fgrE++1YnGLAv5u5kMe/Qqca4/nkEHSlrA cyIvwUsWLevFt6GSiNJnqutIl0jChPFLPSSbknmA5TtfWhTNKEtjVOf4r9jZ1m8h11uW lDNEvlvZ7dcadxmEMw9PrcwLplQz17E2Uk+SUiWCmehNKq/wJe3W3+EUEiGLugixv5D1 ZcOg== 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=ZQkAzy576nDHd3ndzR7Y7Xtl3gkf8f3Zpe36d/TWWKQ=; b=Qi2C+AQB98va/61+qj5u8MFywC8BMfY/P48ubNCwwyYakx2N7DbC4fRQUpLhtGoHzW AXYpkYUM/tLkWp21QxQ9V1a3EJQ2z82N0FY4wI/hzdFOZi9k88blbSiFJKZayceQaWtG EDGXdlILBP1jc0E/rzdwNrv0Qhl6kNZgCNgAs80yvEBi8Ix9cIJ6uiqj8HH3aCmRuU7e zTPyLUWWt8ntNfagKgBJJodc/UhwO9B/oKOpnwTMa0YU57iClwu6QkM/TfjBG2EQlcxk oZgVBcmQYJX8IncXZYWbbyCwIMRfdNjbGGCcuGARiu3HwOCUosrwPUrnHQkXIIi+HdUO YzgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=TC4zXUTm; 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 vl16-20020a17090730d000b00870b0d90078si14796144ejb.644.2023.02.06.22.40.34; Mon, 06 Feb 2023 22:40:35 -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=TC4zXUTm; 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 15F2468BECD; Tue, 7 Feb 2023 08:40:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65CC068BEAE for ; Tue, 7 Feb 2023 08:40:20 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675752025; x=1707288025; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iEjrXErJIKdhtcEswQZ0mAY9twxttpgmOFjOoPcVUGA=; b=TC4zXUTm0f/maq3V+mQBIs9u29+WY1GzFjI7rPlRbxgxOBLP5X2X3mSK yGc9d1Jklwo6TgrVsiEEwnHYobZ3kZuGfw0Y3KbhqVCLcZGpIOkAAV2sB BEzbq0P+p6s1BHTUVkIQ9fTG/R+gLptze6Jppm+ncqJgY71PCS277ilQ5 JeiZDFP9wre4jxk7HO+KOPXMcKmtqJHuKkHQ3vaHTWilI1d1L8RIPW7UI ftm6VSNW9T0w5tXhmqzz0fmjlKKEeBPzV3dZjzY/UaE10SIxjAEsHcm/N 73EjGz+SnpcsOEHC2Sy/qKhXGqYG8LVH3NNtBgPm1SSTXMHPlX3uyLdF/ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10613"; a="327108240" X-IronPort-AV: E=Sophos;i="5.97,278,1669104000"; d="scan'208";a="327108240" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2023 22:40:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10613"; a="697145794" X-IronPort-AV: E=Sophos;i="5.97,278,1669104000"; d="scan'208";a="697145794" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga008.jf.intel.com with ESMTP; 06 Feb 2023 22:40:10 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Feb 2023 14:37:00 +0800 Message-Id: <20230207063701.1106-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.39.1.windows.1 In-Reply-To: <20230207063701.1106-1-tong1.wu@intel.com> References: <20230207063701.1106-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: YlmHi7AXPL8d 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. Hwupload and hwdownload can work with the added formats. 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 Feb 7 06:37:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 40310 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp4033701pzk; Mon, 6 Feb 2023 22:40:43 -0800 (PST) X-Google-Smtp-Source: AK7set8LgFZ+2g2eZ9xKuBoGVslEuypGIjpkyBN3VltTwJ1bVXsMUOPk8BjiHbJotuEJ/sWYh2JZ X-Received: by 2002:a17:906:36d9:b0:878:7921:9a94 with SMTP id b25-20020a17090636d900b0087879219a94mr2015260ejc.16.1675752043423; Mon, 06 Feb 2023 22:40:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675752043; cv=none; d=google.com; s=arc-20160816; b=ODHpSh3xuv74wkqDnrikqKtjqKSpZc6JpLG73ctt0ZDKjYKYeNSLB6gbK/IxsXoKDb cL2yGOKok4fkXWyHXtiZ/9neM87n12A14FJb9hclhv5JyMRHXuxH6w1r7ybZlJi2442P 5K/bM+8Dd+Ua7K60wyuv/d8iLRUF52nAA44xhe12nrAaP6EA0Qpf3BdbPW++b7P/nLIE pjTo9ETeK6D/PWXPAwmo+NUgqvlOU46X1jFJH/o1Xta0UByIbxbAkwaEydPhBKj9Gj3V b4WcOgD03tjwdnNTecxG9P+VDm0QJ/fLPu31LGGGQL2ebBNt+a+6GpRExT0lHbbH9nkE 3kRA== 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=nL+3sFd2nYqtqghJLiOQlN46ckwHvLiEP4x43MH8d9k=; b=aZxYDhE6QlrZnsJmhlwgdG4F94fUuUYGlPxCH98obf+ch6whpwWNl2y1nGAZ5O2W9h iqMwoQ4Tq630RKNb13/oyQcAIoFoHbr5/u9VNk2pskDOvk2Ac1uSiE7mBa+rhn8vVHWO jGmTgwJvSLkWsqGhzLl4aTYmm0wdCDg47Irs1lwJXC2n/qrssp2ikFxrr74v1nPwo3yW eOAphgjgdMSgsxzcQf9omZcgOU1hU2iq4dHFWs1fswbyJ+r0+CJQea2VRuKLQAhb82FP lo6fqcv5J1J0cyDSpm8+gkEjppjWwKtZMZWZiqD5czBVJYUFZNv4A4gNWTwAWzv6tR9i RKkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=JtLYaQRO; 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 fl21-20020a1709072a9500b008714c52cd14si14768173ejc.37.2023.02.06.22.40.43; Mon, 06 Feb 2023 22:40:43 -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=JtLYaQRO; 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 330A968BED2; Tue, 7 Feb 2023 08:40:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C224468BECA for ; Tue, 7 Feb 2023 08:40:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675752027; x=1707288027; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EqTeTtrEhzHKNfiuzUNic1ejLcydDpd7z1Lm07CvOB8=; b=JtLYaQROetJ9mcAw13/sCeq52f8DCJshI5Ez2sHndRaKYTvCReD86nIi vlb03gNHeopUzuRtb7RL0HABskcnCo5dJqwN1yFj5ItuzpzItGitEa9Qw p50TaSJa5K9oWBKLt3ZxOdS2e9Q2Vl9ltW375UtJL0p+fPRYtnUY4IaSa uEcz1uAQ3es12XxvSPmoB5Vgvjcy0xsq7zUoYrWI1tL3krQPtMNgWK31v WILOpRlvDthRU2+QmFuMso/RAw6Xpku9Ef8cBrK7trN9B93LO917nfYGF OpE0zIOPcV1I2Xlmj6JBoRIQDXzCsTcdqfMQCGjhceaxySNa1qgjZ4qby Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10613"; a="327108245" X-IronPort-AV: E=Sophos;i="5.97,278,1669104000"; d="scan'208";a="327108245" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2023 22:40:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10613"; a="697145815" X-IronPort-AV: E=Sophos;i="5.97,278,1669104000"; d="scan'208";a="697145815" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by orsmga008.jf.intel.com with ESMTP; 06 Feb 2023 22:40:11 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Feb 2023 14:37:01 +0800 Message-Id: <20230207063701.1106-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.39.1.windows.1 In-Reply-To: <20230207063701.1106-1-tong1.wu@intel.com> References: <20230207063701.1106-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: RnXHJyd/c/WA 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; }