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; }