From patchwork Thu May 5 10:53:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35600 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp989468pzb; Thu, 5 May 2022 03:53:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJF3DfQYAlOfb0OhERd3e7BLlhFmxu9nKOHURoBkxUWVxD7gkFTvGB4/iv3J6b8Z51og8H X-Received: by 2002:a17:907:94cf:b0:6f5:942:5db7 with SMTP id dn15-20020a17090794cf00b006f509425db7mr119631ejc.625.1651748025953; Thu, 05 May 2022 03:53:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651748025; cv=none; d=google.com; s=arc-20160816; b=j7SHBGkA1WGGGL2Se+DbXagbBYppYDNM0y5vXpz2aMpvwo2ypaQbQOjGsQh7iCVGnk V1lVXfbeonwF0KnJxBxNCtoMASdDr/DRtWg7Ms6UUgnIJG87baSYge8DZHDoOhkA1WFg J4cHXD4pUHuAUTAbG6qRbtnYXxPar9QdzU5XzRbu7UjL/hA4yvzJC+HsCi85wT6iOoaR FMkpXL+cnBPob6gkfPLJqhZCE/d4uK11Eg5WJ7MyRyNWsNGPH0+IT1A9L8ADhFLcVQ8D iV8HYwfVkZ63KhGabrDtAuUHMqZfbI/WohtxeJZNFn48tEbN3CE6RTHg2gfitpnC+Zvq 5TAA== 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=FEaF4rsHyvFw3unzeMnjnCk5+ifuI+7HMurtyESXTXI=; b=BNggjzbYwS12JTZB860clR5FPqZdS+DnsqQg8Q1vs/Zh1cOd790rHaHTNvi82oRJsc dixv9ML2GQxMhtSL71IOqlzouWpGPdjYdf6Ry/gg64kPksa5x/JcCZ+twEpFuEX7mIqh W6qslKKoprblk+bNBmCl3lswl2ASnvlOMkAz9r3OUMX3t4oQRTY8dalv94gp+vEqgbp4 cEeHqH/1LK4LJ8jNETh50FUOPSDGFZpGJmy5ba+N5Bj8S9DuZFt3dv/2OAGN+IZYOi1G Sje797EzJxfD5d2eSZoSCZXBnIhMW09aFBxecGjnTrFcmP8v4jxiQgblprpWJRP+4Pb+ 54/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=JiQn9Ajl; 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 jt23-20020a170906ca1700b006e7f5b1fb91si1755242ejb.370.2022.05.05.03.53.45; Thu, 05 May 2022 03:53:45 -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=JiQn9Ajl; 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 7529868A3F4; Thu, 5 May 2022 13:53:41 +0300 (EEST) 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 2BF8268A3F4 for ; Thu, 5 May 2022 13:53:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651748019; x=1683284019; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=TbseCPhdjQdVwPQpgThKNWKJEkKnop09qD+0KHBpYuU=; b=JiQn9Ajl+JBB/qTBcnZHw4bzkOcH3Pqn1I9N2AP13bTDbxY5UoRVVvZw nyNUOiQj6/X9xeBPPJNDPmkDtBr95r0OFwIinEjKoYu3HL5wWnFf7e1OC GTeC8Hc92TvCUIM/x3o1yfkN0l0YURfNNeQ8FAcVmx7iPYgcnq9oCXX4g 6NJxzKYHVLIAKUicV3lflbwi54GHlkpMwSyw5bRlllTzj57kSmnjlSdyY +rmKP8Bs3W+H39YJBzoa9mr74Y56dowPTFLxItCC9y+tGWycLdkBJVORo KYitFSlOhx5THmblPdwW7fGSKpUNJSm+IkB3SZGeurYoFy0/TKbs1BWQY Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10337"; a="328612312" X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="328612312" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 03:53:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="563187277" Received: from gtapc.iind.intel.com (HELO localhost.localdomain) ([10.190.234.85]) by orsmga007.jf.intel.com with ESMTP; 05 May 2022 03:53:27 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 May 2022 10:53:15 +0000 Message-Id: <20220505105318.716-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/4] 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: VzYCcyXc9b1S 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 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index b28dcffe2a..65af7130b8 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1281,12 +1281,23 @@ static int qsv_frames_derive_from(AVHWFramesContext *dst_ctx, #if CONFIG_D3D11VA case AV_HWDEVICE_TYPE_D3D11VA: { + 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; + if (dst_hwctx->BindFlags & D3D11_BIND_RENDER_TARGET) { + dst_hwctx->texture_infos[i].index = 0; + } + else { + dst_hwctx->texture_infos[i].index = (intptr_t)pair->second; + } + } } break; #endif