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 From patchwork Thu May 5 10:53:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35602 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp989567pzb; Thu, 5 May 2022 03:54:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQICak77cn3/RL8ZXs1hWbx75zyA6MwBYmNS2YUtd/42wI84mwFmQrsWy3ZEObiRLBy+P5 X-Received: by 2002:a17:907:6e10:b0:6f4:7e59:fed5 with SMTP id sd16-20020a1709076e1000b006f47e59fed5mr14350796ejc.480.1651748044965; Thu, 05 May 2022 03:54:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651748044; cv=none; d=google.com; s=arc-20160816; b=qS3dHquB07ZrIh+CFRkvUal641LMFQcKmfZywEvU9EDNT9qW/BTU1LijDJYLnPsTEh NJh+L8/f9Jge5Zzwux50RqQANa1LLHTqg5Y39DOo/xinfYfiDWv5Td8bcRycTKkbc1QF LDza3BSsk/hAUdC4NHdv0gyfEv1BrnZ0eC7HXciNNCSKMyokV1eKq16FEQbD/5VEuYcD epmig6Lasgn/EMHpHaV0HOahUraqsarWkayviZ8L1g/yPY4Am2NW4ufCjI9lGrYkBZMZ zM50pODIVNvHHRUgbtarnFVd7x6+a1jCgdxs6uGCYMdPsToAy7fmT2BFE/DMtNt9KK0/ MMqw== 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=Nv0Wo2n06Rt1KaVAbnsbrVKbWnrklswBCLYUpcwhWmM=; b=A8MxQvzY7xHpyGen+HChJ5oPgYnay+VWjTDA33McQP0WTwREyNb2FP+6bmVkvxUTLN cYWdTqXwDn3n36NsRrR5JbRQGorUXXmZwlcuiXsSB5zd2EQ1ATwGmfDgHP7tKRTZFKLA eQu46yR9pVjiBSaaRB0wc4DFwXQWekQF0Bu3hg6C4FnLprXYCtSCMIJI1ohJJhW8gp/L /LFCMrU+yX78fIex9Q/BVoLK6MAur5vcGUu/X/AnYNqoFdKjhLsv08v5viDJgnazz84C rS0NyCimbPdgtuUfRxO3aKWJ0fYgb0hT1vsTBQHO6L3jqivySPACBdaBUP9a+VCW7zQc 5XbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=cOqUqhOO; 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 qc17-20020a170906d8b100b006eff1696032si1835838ejb.14.2022.05.05.03.54.04; Thu, 05 May 2022 03:54:04 -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=cOqUqhOO; 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 984B068B391; Thu, 5 May 2022 13:53:47 +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 1AD0968B391 for ; Thu, 5 May 2022 13:53:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651748025; x=1683284025; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fvpof9+HfrCqRgzsbIqhU0SdoG0zrYEEwBILZu8iV3E=; b=cOqUqhOO08I/ho2QseraQ2ZRGilmeTH2p14iGZZSsk+4ITJbM+BTnZAj pyf6xsowUGTKtmpDb9uM/ggtMP0f62GjYMYaduJpqhrUKdx6n0pEJ230j NGU48aFWEhhdNLfHHMyWWb94oYooNKkZbvCeLRe+wvxf88Zv59smIF/bF m9LuZkcfv+xL25HcnHiwnyltR6ulkbB21KdNVU7GZmqI/5Dl8iarmgn0z 7DwReEJtt8T2LaZ84PUbQQfYnI8yXC6YmEBkTM97rpavYVMTD7eXzzplg uV5LhkG9JaqdpbYVmAgwaUPcqzrh4EGAxZ3RVbSOK0MqfdBoC0BkSJlCU Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10337"; a="328612317" X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="328612317" 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:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="563187284" 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:28 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 May 2022 10:53:16 +0000 Message-Id: <20220505105318.716-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220505105318.716-1-tong1.wu@intel.com> References: <20220505105318.716-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/4] avutil/hwcontext_d3d11va: pass the format value from outside for staging texture 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: qm62Z/U2oiPm In d3d11va_create_staging_texture(), during the hwmap process, the ctx->internal->priv is not initialized, resulting in the texDesc.Format not initialized. Now pass the format value from d3d11va_transfer_data() to fix it. $ 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,hwdownload,format=nv12" \ -f null - Signed-off-by: Tong Wu --- libavutil/hwcontext_d3d11va.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 2b4e24bb56..bb4e9d6965 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -346,7 +346,7 @@ static int d3d11va_transfer_get_formats(AVHWFramesContext *ctx, return 0; } -static int d3d11va_create_staging_texture(AVHWFramesContext *ctx) +static int d3d11va_create_staging_texture(AVHWFramesContext *ctx, DXGI_FORMAT format) { AVD3D11VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; D3D11VAFramesContext *s = ctx->internal->priv; @@ -355,7 +355,7 @@ static int d3d11va_create_staging_texture(AVHWFramesContext *ctx) .Width = ctx->width, .Height = ctx->height, .MipLevels = 1, - .Format = s->format, + .Format = format, .SampleDesc = { .Count = 1 }, .ArraySize = 1, .Usage = D3D11_USAGE_STAGING, @@ -411,7 +411,8 @@ static int d3d11va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, device_hwctx->lock(device_hwctx->lock_ctx); if (!s->staging_texture) { - int res = d3d11va_create_staging_texture(ctx); + ID3D11Texture2D_GetDesc((ID3D11Texture2D *)texture, &desc); + int res = d3d11va_create_staging_texture(ctx, desc.Format); if (res < 0) return res; } From patchwork Thu May 5 10:53:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35603 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp989611pzb; Thu, 5 May 2022 03:54:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFeBQo2dlg1X4kENiYu1HqRYPUugLgtvxeenFiLisJebuWDjOy2fDLOmIdUhhBgtZYbiwB X-Received: by 2002:a05:6402:298c:b0:41d:6b63:aa67 with SMTP id eq12-20020a056402298c00b0041d6b63aa67mr29209706edb.42.1651748054896; Thu, 05 May 2022 03:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651748054; cv=none; d=google.com; s=arc-20160816; b=GuPN+CviODqqPMuGnfitKWGCpTPKrY7O6rxl6y6fIV2lYpv0HmX0EXI5s5NgR3jvL1 i4haQ1BB2biWkxSWpBgvFvw55GBMI0crlPG0ZZaLYmOuWjrJbjkEguL6S2sbMHETjLB8 uEL8Go6iAK01OTKxKg8D1eDPKMElwTzvx3abDXQJjU6HFK0DGru8xvnIRnkqFGPfEPwK IuiwtFRba94d4vGJJ99jcXIhbxM1kWZGKdJdkFvkcyVFBmz3fUwJs8kqSxoqRcsDD5mT rxGdxF0zkmpE6J2IgkBmEppOzjDgK9T18QdTEyr/tRBdeqf8QIrUSfyDu+rej6CBDQ0p uXPg== 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=Mr3pwYJyDPL4uCmH1X5G1r/SySuhBpNZNGHNIvgOBWY=; b=dOWXMuy0eyFcHKv2Itx5pE5uokh+nOgz600uRpgLCwdP5BjDycHI8YwTcv2ymioF8Z e0u/6FIduywRbwapoMArb/ohXbobtUrfIC8pN1obqwepd1ImqPRAfrjMINjs5qBtyBJv 2MHBeJzCXQLjXaxRhKXMKTnjRYQGU1XVBgCOMC/ETk5TJNil7wzIcJeu0/e3jtFhUTbO pxwM0fvU8qv12dReh16jD/so0+mAtP/RYVp+C0ndM108YegMgRc94RjlMCUXFTOeRtlP EwOwgjUnPVhCcQyj51Rgx5g/1dahy51A6oMp/C+G5mjAvksmaY8vrINc7gmnfu9l7Q0I cxLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=PvL05S37; 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 ep16-20020a1709069b5000b006e7d8f1fd80si1624461ejc.559.2022.05.05.03.54.14; Thu, 05 May 2022 03:54: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=PvL05S37; 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 7843C68B3B4; Thu, 5 May 2022 13:53:49 +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 827FD68B3AD for ; Thu, 5 May 2022 13:53:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651748027; x=1683284027; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=27z3tC3TEQbbH1SW3iptpsBSNTtFzLh5nc/CyexCvro=; b=PvL05S37wm0yxBXGea9pQri1QY2ndC83GY7Rt1ytejzgNgPURfP0a2kl TWBiGQLtS22smP7MaRAkOYxEzK5T7h7SBK+Lx7UJoxursCiIZ1WSoqcnJ IszT/us4vjRviKprqnenXjpruikbwrJHkWEDaB+yDY/xJAXVh4kLfF+xw XonN5B6vjghE4WpznuroEpEAFDuM8po9NSCgdibzolT8WoJcOq/YwnLcm OwASkUIeA6ZcdvdqxsufuRxMjIIvO2gJRi6kpbeljMNWqXTh26F26pDoz MyLrT1LpljWUczVRXOJM7SiImI2FeebaJuqE8xhtz11+nsSeYnr3RAGfy A==; X-IronPort-AV: E=McAfee;i="6400,9594,10337"; a="328612322" X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="328612322" 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:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="563187288" 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:29 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 May 2022 10:53:17 +0000 Message-Id: <20220505105318.716-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220505105318.716-1-tong1.wu@intel.com> References: <20220505105318.716-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/4] avutil/hwcontext_qsv: map 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: W77X/a1wuTbz When input is a rawvideo, after mapping QSV frames to D3D11VA frames, the output will have green frames. Now fix it. Fixes: $ ffmpeg.exe -y -init_hw_device d3d11va=d3d11 \ -init_hw_device qsv=qsv@d3d11 -s:v WxH -pix_fmt nv12 -i input.yuv \ -vf "format=nv12,hwupload=extra_hw_frames=16,\ hwmap=derive_device=d3d11va,format=d3d11,hwdownload,format=nv12" \ -f rawvideo output.yuv Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 65af7130b8..27eedef5f8 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1388,7 +1388,7 @@ static int qsv_map_from(AVHWFramesContext *ctx, if (child_frames_ctx->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId; dst->data[0] = pair->first; - dst->data[1] = pair->second; + dst->data[1] = pair->second == (mfxMemId)MFX_INFINITE ? (uint8_t *)0 : pair->second; } else { dst->data[3] = child_data; } @@ -1418,7 +1418,7 @@ static int qsv_map_from(AVHWFramesContext *ctx, if (child_frames_ctx->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId; dummy->data[0] = pair->first; - dummy->data[1] = pair->second; + dummy->data[1] = pair->second == (mfxMemId)MFX_INFINITE ? (uint8_t *)0 : pair->second; } else { dummy->data[3] = child_data; } From patchwork Thu May 5 10:53:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35601 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp989516pzb; Thu, 5 May 2022 03:53:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1yipjdVvNmwOyQwkP3uN8aHdwmJZKbmB45d8nbkBov2zd1KJ0WWceJHS+Su5cWHclqFH4 X-Received: by 2002:a50:fe1a:0:b0:425:e276:5adf with SMTP id f26-20020a50fe1a000000b00425e2765adfmr28729254edt.284.1651748035879; Thu, 05 May 2022 03:53:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651748035; cv=none; d=google.com; s=arc-20160816; b=EvVWbLmgCQeHtYdrV0+dT06AJdLKa/RfpHlBSq2oIqqPVCYVZ7GsLv7vull2hSJaww M70BmZp33BYjnmuPESTWfj5e1DssUN/sJoaglMtJbp2L4SnFSlPB5//M+jaf5yfZ25Km kRjwiubTXcbRdWXT0Wzbu4LeDoQ1erd+edFlqnElzBHpr7LRQxe8xL5ehg9fdMr4qZhs W1gn5AiaPJSLOo7nedGR71U3QHLFdBM+Q3iPYkPIH/VrLWA9mp6KbReo7w87lihtaes9 3LFtERiEm1uTxKbeew6JOREIQFDLh61SY1nnK2lfFJnbQ0x3qxtcRK9dmgiWz85ivgyI mnwg== 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=tm5uH5350uC6OPdsjl/DRw0vb/ReAeUlprMq6F0yJb8=; b=h6nC/vqRCzQbaP5dFjvUWArRKO87BmVJK69NMSBoF3kORjO0qq9FbaMrvXo0Gq0aLP O9tO8EjQa+Olz+7h6NWQmbN4SO8S1gpJQjN6T6s9BzW/oWqICZEsOq2ZgF7BFYEM4LOE lJQz+hM/7HPOFXbqP8l00hqRrYy4i1tYSLT0dcZxK7QE+cghZghFXUOlg7XBamiDvyy5 vrw7AmKZ6OE3LqvvQphaIVdxcQJejQugkO3eGuEY8jy+Yp2spnBeFrc+L3tw5BsPljPT +gDWXRz2gn8PmNLzJ3i7A9E8QPiZfnReaMvKCXTArMVTAnjEhcATm//vd1XY+5/8QuPS p/LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Nfv2mBY5; 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 t12-20020a50ab4c000000b00425b06b2d2bsi1557836edc.122.2022.05.05.03.53.55; Thu, 05 May 2022 03:53:55 -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=Nfv2mBY5; 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 82C2B68B3B2; Thu, 5 May 2022 13:53:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D771680226 for ; Thu, 5 May 2022 13:53:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651748020; x=1683284020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/Whx9zrYvn1C9qkI4SkcI1njQIm5llp3MPxtVdSP5W4=; b=Nfv2mBY59fWDebtG/aq4ny9oLkmns/O1pmKCJIHBBW4EOg9UwsuhxTTN uhrljwzUALDRo3QCytTTNNwCNEXZ7/MLHb4EezykKcrSe+wLdeSWGhzF1 oz4dsuig2gFh6u6Kc4HIRgui7rBPBvDaq9o6cJo81JtxOfdJmZo1m2W4/ jaoZfBSKcuU4rQRkK81PKAVpI+FaZlD3Q3dOqypcyKOqbBzfc/pAMvtN8 4Smj/ITW9BSlZONI1ToCmKEHUyoLM+3yuSOHj+4qAppjAS0t3Eq/xHC3y IcXL6KDJnx+mOnHUBpVU3Q+0/GrR9BsACjYswT/3X2drxBJO9PP4RF+7h g==; X-IronPort-AV: E=McAfee;i="6400,9594,10337"; a="293269109" X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="293269109" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 03:53:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="563187292" 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:31 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 May 2022 10:53:18 +0000 Message-Id: <20220505105318.716-4-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220505105318.716-1-tong1.wu@intel.com> References: <20220505105318.716-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/4] avutil/hwcontext_qsv: map D3D11VA frames to QSV 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: 0JQvSu7vGD3u Fixes: $ ffmpeg.exe -init_hw_device d3d11va=d3d11 -init_hw_device \ qsv=qsv@d3d11 -s:v WxH -pix_fmt nv12 -i input.yuv -vf \ "hwupload=extra_hw_frames=16,hwmap=derive_device=d3d11va,format=d3d11,\ hwmap=derive_device=qsv,format=qsv" -f null - Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 27eedef5f8..30d3360d42 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1885,7 +1885,8 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx, { mfxHDLPair *pair = (mfxHDLPair*)hwctx->surfaces[i].Data.MemId; if (pair->first == src->data[0] - && pair->second == src->data[1]) { + && (pair->second == src->data[1] + || (pair->second == (mfxMemId)MFX_INFINITE && src->data[1] == (uint8_t *)0))) { index = i; break; }