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 From patchwork Sat May 7 06:24:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35621 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2035033pzb; Fri, 6 May 2022 23:25:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGXKAkWvg/LUiw+L99C9oxs133zmcCx/GHNE9wpXKsE2KlNOCzUpoZnz2EfR0Pw6n5WCun X-Received: by 2002:a17:906:4944:b0:6e8:a48d:804e with SMTP id f4-20020a170906494400b006e8a48d804emr6256724ejt.164.1651904723886; Fri, 06 May 2022 23:25:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651904723; cv=none; d=google.com; s=arc-20160816; b=UbKR0kxPzpfs6olkte4qacCWkBEJkbK9Ry83IBnaAqrl+/Ozvk+uz9Ro9E23GqTkPY a/oC1qj6FkjAXhjkEw8hwqYuSGwt17DEgEhXN+fwSvuC5j21ZOeyx+ewc1Qsf7w5sX6P byf2G6R9+YeYZBSAz05RZSaU84qK0rwe6URh1TGpIHEyKkshxSc041I0+79XdLPCe8FU CmyGgdNdQLZPEr9FuDDWrBgUrjaMoc2qrCcY2ido8DXZLyTkN70LwqLCQpnS+uzXdkDr 4RaievRIU0NZsBTYo6qV9WPHqo1qJauezNCnk0lOm5P5+a2zFVrdfsX2qMH6Xfw95DLe XH/Q== 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=PfZFMVcK2KEcdmKa5lOsYPy2Refw3T/1/JSqQzrSk3N53QVo9b7fNkEORluxTOqAiL 3gKMWqsIGzMi8D687TtRtZk+4efSiWmbDMf17ljNGLYikmO8XsvO7wkYtHpNB/9Ze4o+ 9CtDrXK8DMX2JJaWpKwGmJhayJeyfZIoTPtFIUF9VZH+4weaEyENwnaStvY4x8Uee49s LrtYy8zG7VF5LuuVu0FudOQBTp5Y6YwNe8SlRHy1KANoDTagVoqRpsOXIz0LVVhPgqTe XuOhD+7RC9X8bgdSwb87kM9yIwplTJDRTJMqFL1+mXlUQaR4Fx1dT1PQ5ZERvGOtIdO9 lxdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Pt9funt6; 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 jx15-20020a170906ca4f00b006e87cd34739si6058448ejb.103.2022.05.06.23.25.23; Fri, 06 May 2022 23:25:23 -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=Pt9funt6; 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 4ABE368B373; Sat, 7 May 2022 09:25:14 +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 EB33E68B104 for ; Sat, 7 May 2022 09:25:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651904712; x=1683440712; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fvpof9+HfrCqRgzsbIqhU0SdoG0zrYEEwBILZu8iV3E=; b=Pt9funt6O9RtUQfkvbdMOitci8ePuGoLb4mOW5eXlGdzQZyNFst7rEuy tzDyskgm9Ax93CkgAnnEe11IyMcSUcHwF0N25AWEF0hX4uLz3FqQa61ZK YDuTEibT9DBMLKFKLB5hv8wb0mZQpz7eeSgxG22f11Ah/ebfzo/JQro8K dHcIfup7+Rl+tcv8pFTM5VU5pVF2d1TYU2wkGJc+VEQBUKQD0b/4TCRLo mcAd7ARIze0nIRiZplGemsE6xks+JWNpiLS1yMio43eMeorzVdZWByNhD A6bqURpXnIiQgMkFhx4rJVLHnuGTiCCknUXgt2rj5njcF1xohhyWUsrD1 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10339"; a="268557751" X-IronPort-AV: E=Sophos;i="5.91,206,1647327600"; d="scan'208";a="268557751" 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:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,206,1647327600"; d="scan'208";a="586385472" 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:57 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 06:24:40 +0000 Message-Id: <20220507062441.779-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507062441.779-1-tong1.wu@intel.com> References: <20220507062441.779-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 2/3] 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: +qvUf8rCpVOI 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 Sat May 7 06:24:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35622 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2035063pzb; Fri, 6 May 2022 23:25:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlnK6pBOOyg3LlO5UQSgtbXwly/pdQi2hhyk/2vSFl6MVsqmFrZRCM+FNYbDc0BF7uXj6Z X-Received: by 2002:a50:d79a:0:b0:425:e577:c71a with SMTP id w26-20020a50d79a000000b00425e577c71amr7367465edi.188.1651904732675; Fri, 06 May 2022 23:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651904732; cv=none; d=google.com; s=arc-20160816; b=cSJ5RiCz3ZreuAymedBYt59Z0ZakzyKUOoLoxFORFL5m54tb0xD9rMf6Gax6GAxz1h KeKAbvHBSSbNqSr8ZStlkkCHm4usys2kQqwgZLTHKH0y3zqlwgfg71o8ftL3uBYt570r f2jFvTZeUWx7IZ39cnsxCLPa1y7tU49qJ9r11MplfwAO3WskEyu2r9It++Z4jtWNKg5G rLw/7wJNAbGS+/L8c6Yow7Aln+afbJvoVFMfF5WZq0pR2WZDK2fc0KxHL/tfhyAhaokj qtwlZ/rlPUZY2uVrM7NIzip464mNSK0mvPQzQSFCwL9iKMZj9C4s6bdV38VX17roWsqk 9kvQ== 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=naXgAUGOLDTP8EA4heAJSzp+E4AZxyDDuB9CTL3MP8M=; b=xiz0Z5eF8rUCVZma7zzZV/zNahbsHO00V3nppSanF5PlDbfcG+pJEpKWJQkzEb+vBi Z4vXNwJ+jyQfzSwcgFQ5QufMRjx1zHkD2r8eRzybwZF7Un1qpznj47Ri4rFwyXZO/PBa 4/WvhPxlbDx4QzETlAI5kjThx/XiaPtNDKIHOWEbtARBv/TuoIjVuBdCnQMMovUWuB4P KN6RF7LEjZRAPy50IxfkjulS1q1R4XFBZDn9RgKVbTKogwiI0JqvB30NoVbzsBzS05L6 A0ut4nq8CVKOFl8sSaOTsYuWsLOQmTYPaOZlZQc+xmOGDbOjU8ED16GxF8JSaNN9AC0u C5hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LOXwkUNx; 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 sb12-20020a1709076d8c00b006f863e61b2esi509117ejc.563.2022.05.06.23.25.32; Fri, 06 May 2022 23:25: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=LOXwkUNx; 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 5198368B387; Sat, 7 May 2022 09:25:15 +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 5B67568B142 for ; Sat, 7 May 2022 09:25:08 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651904713; x=1683440713; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n/+1byLVuYIQWsZeB/maV19KA2gvwODMjZsJ2hXOVSc=; b=LOXwkUNxKQp+yHUb3A6UuW7kJnCeJGB8SpFjJMfcabtm5o5AQnfgcRdv sJvjvuq2FQ0f/1w6VZBuiCUYYw695NQT5stynli3e6/sSqnHO+7NtcXgp lLiIsvt3YC3auxMVJA3PhjzplkVPAFn8XDl6hbbb/RCJu8Pjq2uPpHR9H McskVcu0w+z1XNradI/gDDpDTd1ruw0BOwuC1X4JA/bHlRXDJRYwJ2zSI xadxOic2v7bBF5HGoxqPLFQ9AC0oUIIpcvCuALosb5LWKNfmUVAI2SzQE nsvSvR5dmIKbOKaIa40pvHK7sT2GUkyv0ct9UZXjvNwrxdBmeNLfXUFuN g==; X-IronPort-AV: E=McAfee;i="6400,9594,10339"; a="268557757" X-IronPort-AV: E=Sophos;i="5.91,206,1647327600"; d="scan'208";a="268557757" 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:25:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,206,1647327600"; d="scan'208";a="586385486" 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:59 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 06:24:41 +0000 Message-Id: <20220507062441.779-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507062441.779-1-tong1.wu@intel.com> References: <20220507062441.779-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 3/3] avutil/hwcontext_qsv: fix mapping issue between QSV frames and 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: oeExrSx9e1T1 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index ca21543075..81b298dc20 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1387,7 +1387,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; } @@ -1417,7 +1417,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; } @@ -1884,7 +1884,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; }