From patchwork Thu Nov 17 02:37:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp819432pzb; Wed, 16 Nov 2022 18:41:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf5H5U7MdTn1Nuarf2Udt9Hl9hT9Dsxi4Ci805MsF2RUxiyAdH8FXcuXLANVOXBhVXr0vsN4 X-Received: by 2002:a05:6402:1486:b0:462:735e:e34f with SMTP id e6-20020a056402148600b00462735ee34fmr444996edv.213.1668652872898; Wed, 16 Nov 2022 18:41:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668652872; cv=none; d=google.com; s=arc-20160816; b=BsB5GfTx4RTK+t9m/yVxgha3S0C68Nk6FWAi64c0DpLJMS17+WXMPdYdm+XFQ1ho4F mqaP6WYKbTWjSZhR25q+fFQhm/j1+A1cUoTTYJoeuLPnlQlAQ6mv0XHIcSDnZY0u8RBP eppZnmlg7oe5hB5kLmQyCvUCSk5CXgr9U1ZLSxkqrWICrQ3L2f4SMRAc27g8D/HWYq/C OtTK98k+AxohTSKWN87fJBJ4EBWSz6GhZx8HncLSFnczGGT89glTJ3GBDNOfy2v/JTgy E0ZiwmQbPGbKcAoMwZbIz7EyHoBdnpCN/M1u1IqnVY9ipnmjEa3fa/jGrGHlYCsjLKC3 qO8w== 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=YwcMamITQuQif4a7Wcz+7k8/Bl/Me6fAdjkc7FWlXdA=; b=fN8kOwmygzDVSVeoa2h634EWw6WyihvQpcuWmwXBBamjit2XWvp0xvi/s80qIvAhaO MatXDRyrUPr1lgpKDqCd+2I+TeanbS+42shdBG/dqVQJoWHD22+wQ2WDryClHmjeuOre dsIooOd0tF9qIMBlpv98j+Y9gdgADbjRhQT6XBSdPxXnXXeJRTlWpIfCNLcyC05udVxW RJc11NQyzM5DrGyLAa1dbg8wfDW93MFHjGnEwVH+JBW60r97BWlVWv/4+3wkz2iV8FPD 52TPfUQVyRMoRdWr9UUnBrygKRuj/jWDXEast6HGnVeFw4YXB/DVljHLGl2RU+RFmLeH a1mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=IoSsRQ+H; 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 di5-20020a170906730500b007add150c78asi16783160ejc.503.2022.11.16.18.41.12; Wed, 16 Nov 2022 18:41:12 -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=IoSsRQ+H; 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 1A3DA68B9BF; Thu, 17 Nov 2022 04:41:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4052468B17E for ; Thu, 17 Nov 2022 04:41:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668652868; x=1700188868; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ANmIe7sgEh2NrGcbHBkCvNXafC13hM9DR6L2HARFsZA=; b=IoSsRQ+HdIJvjvBm+HSo+PRC3tjiEG9RvYBcY/w39m+sZ1GsOyWREv+o 6GJ3hUpB5mbJsXhB4Bn/u6f7/oISXiiJyN9qfPkfB/wS3IbQcn/Tj7w6b eOq9pRne9cKZUt7l4thqBi12rhf6mRyUrQ99586mFEi7hN099HuLof6h0 4JLAnwAkD/dkIX8Bt1nbt18v3KFnI2ts8/Z9two+W4OFwTo/9MV9t/aWQ inBKAawtwghZ0q0pWNE47Ykv3oWo+LoIRzYpgbZBmZGKXXvjH9mhQk2m1 80dtkg99gMvomwkFt6LgFDTnxA7I3cOP2kxYbF9rG5uWzhQgh3GZ9IQ0Q A==; X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="374867399" X-IronPort-AV: E=Sophos;i="5.96,169,1665471600"; d="scan'208";a="374867399" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2022 18:41:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10533"; a="708426966" X-IronPort-AV: E=Sophos;i="5.96,169,1665471600"; d="scan'208";a="708426966" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2022 18:41:00 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Nov 2022 10:37:15 +0800 Message-Id: <20221117023715.66653-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/pixfmt: Update the description for AV_PIX_FMT_QSV 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cydvFNltlmNq From: Haihao Xiang Since D3D11 was introduced for QSV in FFmpeg 5.0, there is an implied API/ABI change for user-supplied frames [1], hence update the description for AV_PIX_FMT_QSV. [1] https://ffmpeg.org/pipermail/ffmpeg-devel/2021-December/290444.html Signed-off-by: Haihao Xiang --- libavutil/pixfmt.h | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 224670a731..37c2c79e01 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -206,8 +206,36 @@ enum AVPixelFormat { AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-endian /** - * HW acceleration through QSV, data[3] contains a pointer to the - * mfxFrameSurface1 structure. + * HW acceleration through QSV, data[3] contains a pointer to the + * mfxFrameSurface1 structure. + * + * Before FFmpeg 5.0: + * mfxFrameSurface1.Data.MemId contains a pointer when importing + * the following frames as QSV frames: + * + * VAAPI: + * mfxFrameSurface1.Data.MemId contains a pointer to VASurfaceID + * + * DXVA2: + * mfxFrameSurface1.Data.MemId contains a pointer to IDirect3DSurface9 + * + * FFmpeg 5.0 and above: + * mfxFrameSurface1.Data.MemId contains a pointer to the mfxHDLPair + * structure when importing the following frames as QSV frames: + * + * VAAPI: + * mfxHDLPair.first contains a VASurfaceID pointer. + * mfxHDLPair.second is always MFX_INFINITE. + * + * DXVA2: + * mfxHDLPair.first contains IDirect3DSurface9 pointer. + * mfxHDLPair.second is always MFX_INFINITE. + * + * D3D11: + * mfxHDLPair.first contains a ID3D11Texture2D pointer. + * mfxHDLPair.second contains the texture array index of the frame if the + * ID3D11Texture2D is an array texture, or always MFX_INFINITE if it is a + * normal texture. */ AV_PIX_FMT_QSV, /**