From patchwork Fri Apr 29 10:45:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tong Wu X-Patchwork-Id: 35504 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp212136pzb; Fri, 29 Apr 2022 03:45:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVhZaL5v+cDXpIYMicPT0bLu6tvzchRjWJZJp9Du/INHV5yuQWaZ/U1rarbrN5golhtpMC X-Received: by 2002:a17:907:2d11:b0:6f0:f39:f647 with SMTP id gs17-20020a1709072d1100b006f00f39f647mr34754380ejc.694.1651229142154; Fri, 29 Apr 2022 03:45:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651229142; cv=none; d=google.com; s=arc-20160816; b=UnM6tXvr/LL+oouO6ZrWbwJUBX5Cz+hK5AZwXxSQQdssv3zBM9oPbDT88TMyYIfMb7 l/JaMvBr4z84zpMJXHz7lpoPdJ0VxS18XYekjr2i7RvrYxjzxJmN0H2DvGRvR5nSvz1I ghENqGcXhb6pmtKEyqxjM5ovnNP9K2tQG39lF8hJqW6JQs0qG4oWhFcjxBFZhGWNQizS vaVN3Nyj+Bmkv68Gdk1hyq9aHFR371ZKBQUfa2xKO+ZGuf548ncRdujulA05ii2zV5Ys +e9zKN2GA9hJDkSG2mujSZPYGW6+bh2pIhLrI940UfCGFuhEGt9Cjr8MJnCV/UxKIuYK baeA== 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=Le1J5zk2nc8MM7SVCcmnPtkeEXpcGCcTSum8JtTY/2o=; b=mIMs8VpwGI2maRZZPduaNCsuMlSsTpKZxkhQWgdXxpnYweaDa/h3n1aqsVIevhWYqy JdWJo1UmHCk/iskf00nWdOrtn94Z5FLXij23OdHz08tfD2f4jPDckbHOqMKEdMhhiLXY bnYqGTPaGUDWy5ni+wEWMPUJPi0uoQksIw5KrDTnW+01T0IAOh6iEt0ritbBGuEe0Pr3 elDpc430lPBnzZVzX4efX3fu4BelHmSj8vUW1CbQEn7JN07fj0ArwwIku8GdCkgTgHfr MDxtoYLBfLVrTLW2gMGPHJpnyq+gtwwWI9L/3t/7n0RKd6NkA5G5ShAD3yW1i4Ms8ZmU tKWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=jUd6gn68; 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 mz14-20020a1709071b8e00b006f3bf032c05si5265617ejc.793.2022.04.29.03.45.41; Fri, 29 Apr 2022 03:45:42 -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=jUd6gn68; 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 E04C368B2C6; Fri, 29 Apr 2022 13:45:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9547C68B294 for ; Fri, 29 Apr 2022 13:45:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651229127; x=1682765127; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CwLgUhv9/5i28NGmEU+boOX9Y1cTIVG6InFgcv7VpRY=; b=jUd6gn68eewKFTsVSNqHDwOMnO69hSDQlqQGjmxnmkZSr6IgbLx21IqZ Wu33iahkyoCTXJDlTtui6d5DI2bpguGgkEawWNbAn/tuHW11EQr5aYIwi QY8Wm8uC+uXR26obE2hhDbFKmEDwHiprv8DqmGrAKAmM2FsuKKW4gX9U3 OVt1Tu35S2vd83qJqOYvifOYyyxL6WsqMN0ytNxJ6kP5rtK1xUccPWddD OM+aPSp7liKOgCUkMin+cXtsgJMFGIaePo5r7euXhb75fMRNyZDYGteW7 D9WMsLDXTGCO4dCb8uQn8LY/xisU6QJRrAAO8LGr6U5QbyXrEGwoc+g4L g==; X-IronPort-AV: E=McAfee;i="6400,9594,10331"; a="329548322" X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="329548322" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2022 03:45:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="566080485" Received: from gtapc.iind.intel.com (HELO localhost.localdomain) ([10.190.235.42]) by fmsmga007.fm.intel.com with ESMTP; 29 Apr 2022 03:45:17 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 10:45:02 +0000 Message-Id: <20220429104505.1747-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429104505.1747-1-tong1.wu@intel.com> References: <20220429104505.1747-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] 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: zVWVw9u02c4A 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 66c0e38955..d9d05e936a 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -808,12 +808,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