From patchwork Sat May 7 06:24:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35620 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2034969pzb; Fri, 6 May 2022 23:25:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfVY8uFceZxEDo53mN68e0CIXGSTQHf/+X+3X/hFpvf2eju7cFDtUp5DxLfLrux0MmOAqS X-Received: by 2002:a05:6402:2714:b0:427:b9bb:a179 with SMTP id y20-20020a056402271400b00427b9bba179mr7421115edd.102.1651904714447; Fri, 06 May 2022 23:25:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651904714; cv=none; d=google.com; s=arc-20160816; b=CFGLj7caEcxvh+nCpN/TUFcZQmOmRtP8y/LwPlcM+8aoH8cyhU4Q5upLS2yht3vjGS lyJpMwnJXixLq50fzYNEN9iDlERUw3+fnutr4KZ2y6ycux0GW2tLy75izV0tLjG22UuA ayLjIclQGP3p4tMHJQF2TN3TPMGwmJRMHlGP45/Lmqi3jxlYsZiKKmAXfKkP86D9L7xr u7Vf0mPUsZQ+u/9mXIAinRx7C95fYO2MnkvjQQLgP9H1UpUjEmnKT3U3mLsWLBNe/ChA MYVJVa3Ruq5tEuRN/EMyhDAct0mgE9Bx3kgbaGs7JdgueKUEttLNGJ8dtEcmcF2pQvY2 DyUQ== 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=lykrxyxE5VM+ys4lXApVSxmQm1xCXmV5l8mXKew5OT8=; b=A4eDXJHy0hWS6QFP+fQ36J0mCmaX4HCIGQ3Sxi6dG6T1ftCPuZLZWOjWgsROeCYsj7 Mnc0s1DCRf8FqSvKmiwijegvMmlllDZUwx0A8konCKvT21twMOJdLDNC0jwApx1/Usag lCurK5+e+ITfR2ajxI/vJfXPdrWcdp0p19NqSsvlk5F4a9Biy4oktaVPisDpBtm5zIBU /qpUEv3YDvbW4lRYC1AiAWBSKdOV7aK5OeSftpOVkMcxet8jETZYbq634ms+0XZlmVEx M7DtToXr0qEWnHzwwBldoTWIuiJxP8299bObkucSrIVx5ljM1/403oR4CoQevG8k98Mf CJaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=GtDnAhbF; 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 a2-20020a50c302000000b004281baf2185si6273765edb.439.2022.05.06.23.25.12; Fri, 06 May 2022 23:25:14 -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=@intel.com header.s=Intel header.b=GtDnAhbF; 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 3BFC768B245; Sat, 7 May 2022 09:25:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B1EA68B0B9 for ; Sat, 7 May 2022 09:25:00 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651904706; x=1683440706; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=93NRhvETE29qt776pFwYrPySBG3ZtTJ7aidDVos0itU=; b=GtDnAhbFNeyQi63oCi4UOtTx1jD1yLk626pyaspc88cFfb0IuVhZ1i5D 2CVFjZ1Ih8bHMZY/NZAS3vJf2TNBEuGPr3jYZQhI1BdH0FN/XQjbVUSmh nNT1ZbEvdVChNNKvI8AYh8vDoXExvy8IsEHbHmMSmZiV55iTmJgRsfocf WNTOoWhKLLlYWhusQbgiQStR2Lg4FIhbzrZy+uXt+CzVtYBTvu3h9f9pU USiMEP06JJ9w1OMgHjj/klQgi3Ag1tiK5qrcPNWLTNPA7/x8Wll8fcmD5 WBKD8alreGD1Lue4MX88T0wDlyu4/9sXAo9qE6LM95b9GCrbALyQiy+jn Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10339"; a="268557750" X-IronPort-AV: E=Sophos;i="5.91,206,1647327600"; d="scan'208";a="268557750" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2022 23:24:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,206,1647327600"; d="scan'208";a="586385451" Received: from gtapc.iind.intel.com (HELO localhost.localdomain) ([10.190.234.85]) by orsmga008.jf.intel.com with ESMTP; 06 May 2022 23:24:56 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 06:24:39 +0000 Message-Id: <20220507062441.779-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/3] avutil/hwcontext_qsv: derive QSV frames to D3D11VA frames 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: TmzINM2OhTMV Fixes: $ ffmpeg.exe -y -hwaccel qsv -init_hw_device d3d11va=d3d11 \ -init_hw_device qsv=qsv@d3d11 -c:v h264_qsv -i input.h264 \ -vf "hwmap=derive_device=d3d11va,format=d3d11" -f null - Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index b28dcffe2a..ca21543075 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1281,12 +1281,22 @@ static int qsv_frames_derive_from(AVHWFramesContext *dst_ctx, #if CONFIG_D3D11VA case AV_HWDEVICE_TYPE_D3D11VA: { + D3D11_TEXTURE2D_DESC texDesc; + dst_ctx->initial_pool_size = src_ctx->initial_pool_size; AVD3D11VAFramesContext *dst_hwctx = dst_ctx->hwctx; - mfxHDLPair *pair = (mfxHDLPair*)src_hwctx->surfaces[i].Data.MemId; - dst_hwctx->texture = (ID3D11Texture2D*)pair->first; + dst_hwctx->texture_infos = av_calloc(src_hwctx->nb_surfaces, + sizeof(*dst_hwctx->texture_infos)); + if (!dst_hwctx->texture_infos) + return AVERROR(ENOMEM); if (src_hwctx->frame_type & MFX_MEMTYPE_SHARED_RESOURCE) dst_hwctx->MiscFlags = D3D11_RESOURCE_MISC_SHARED; - dst_hwctx->BindFlags = qsv_get_d3d11va_bind_flags(src_hwctx->frame_type); + for (i = 0; i < src_hwctx->nb_surfaces; i++) { + mfxHDLPair *pair = (mfxHDLPair*)src_hwctx->surfaces[i].Data.MemId; + dst_hwctx->texture_infos[i].texture = (ID3D11Texture2D*)pair->first; + dst_hwctx->texture_infos[i].index = pair->second == (mfxMemId)MFX_INFINITE ? (intptr_t)0 : (intptr_t)pair->second; + } + ID3D11Texture2D_GetDesc(dst_hwctx->texture_infos[0].texture, &texDesc); + dst_hwctx->BindFlags = texDesc.BindFlags; } break; #endif