From patchwork Fri May 6 05:57:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35611 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1491141pzb; Thu, 5 May 2022 22:57:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgG2Oqe0o8OOIzfKnEc2Ufm9uPlGqw2ehA5rGFT4w4IXnF9wf7/W9+AwapH9aWTlak9HtD X-Received: by 2002:a17:906:4795:b0:6f3:d1cc:7127 with SMTP id cw21-20020a170906479500b006f3d1cc7127mr1487996ejc.461.1651816652640; Thu, 05 May 2022 22:57:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651816652; cv=none; d=google.com; s=arc-20160816; b=fR1pJfBx1FUe4pMF2J60KBivMPqIRTWSpWn9UJF4d2OfQ791Pn8cTgyV6o83/f8GwE y4zhSmo31NuVVDEtYlIyKDtj3SUSmr2Ecpnr/eR+cmYqreEfd6zJHPf/VLfrt6be8Jz6 C4wOJ7KIwp4Szl14hrMloGN8fjJFZiT/gFAaJkSXHA41khxuwYWhr7GHoXT2MJ4tYKsm g5EjJtdXqtZQ2kuqvXK0G58DZcOyQ8MTBbJdNUopoUyvys/z3kW/5xCcM1npR/uNIfvU gFnUcZj64BTTrM8eybhevbWu2ZD0CrAU3fEJegoMbTg9+dJpJJu2ARig031iMvjo1F+N s8gg== 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=zWYpWnE84FoBE3qJyOFkSLW8zAm4Ic+9hn7AoQsDtBM=; b=AVgscs74bDAnOIiQCMTOgP9Q6aKhEkRl9/uCOgevnVR+yWcH/6Ju2GJxa3sRXxmX8J G7VrvxmFvOGntMaoFn+QdOE3RZycQJ9ewJMV/bZ6WivoLzWzPv7yHKH0SGxHov6ed65s AHiX/3yeoINPM2fVwq1+w/aokppyitcOysC9WzfFl/41iqRanFW9FIuHUZQxmLI+saRH 7w6YQ0rtRDU0TGbUI5+1bLsE0ZAsnLRNqkDH8RjhswU1GfF18FNtPzoVmyHoQU/LPmCj /3ZQq1z8Cf1ENaaLVw98wU1xqv9qmNUVL6axWTJVZ5aIXdqsQiQ9fJzr0TUhXx9AqZQV XVzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=AsA+tn5q; 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 i13-20020a056402054d00b004280d0066a4si3498581edx.453.2022.05.05.22.57.32; Thu, 05 May 2022 22:57:32 -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=AsA+tn5q; 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 5DA5368B192; Fri, 6 May 2022 08:57:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75C8D68B196 for ; Fri, 6 May 2022 08:57:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651816646; x=1683352646; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=X4mzjwv5wArcIV8CV1EUknS8NmVepAWEVhZJiKNt2wc=; b=AsA+tn5qCEb3h4SkK02oJme7TLn7Y9Kz9xD3/PHLtu/Dr8/6nPNxy7Q7 F4PSunPCN7W0V/IB3Cn1nVTokFzQxlb3ROrs1NHPdwqKPFM5ncatRHoWS +NCzps1FE/dm895S4Wy0DZAefOXAZEtIeXe+w8wXnnJ25XOjC9eG/dic8 8j4nwpIt9/N70uZZNxqjJo1ptRqhJTIrgeTWb3EzZG7ZEZi/61hsCspjw 27T03gnyxsbl8Icv9meyAq01rF1XgUqU02kW5OUBgIGoXwO9q5g9WA11G 7uIoas9o1KBrOuZywnmMUWu2z4CVdNFphhJuomHK5i/wOtrDLXeiM1SK0 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10338"; a="267201055" X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="267201055" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 22:57:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="568953766" Received: from gtapc.iind.intel.com (HELO localhost.localdomain) ([10.190.234.85]) by fmsmga007.fm.intel.com with ESMTP; 05 May 2022 22:57:18 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 May 2022 05:57:09 +0000 Message-Id: <20220506055711.1671-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: gSDF52LN67qu 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..bf150c8553 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 (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; + if (i == 0) { + ID3D11Texture2D_GetDesc(dst_hwctx->texture_infos[i].texture, &texDesc); + } + } + dst_hwctx->BindFlags = texDesc.BindFlags; } break; #endif