From patchwork Fri May 6 05:57:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35613 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1491224pzb; Thu, 5 May 2022 22:57:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwU7a+i4zYC96MB3ZVIb2CY/64yLVLAsur8BZr6rc5zdOJhM9ePQu6Li7SVAV72fcqI60Yk X-Received: by 2002:a17:907:a0c9:b0:6f4:c0e2:6a8b with SMTP id hw9-20020a170907a0c900b006f4c0e26a8bmr1433827ejc.263.1651816671242; Thu, 05 May 2022 22:57:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651816671; cv=none; d=google.com; s=arc-20160816; b=a5QlhirV3U0kkRV7sJFbzuPyZy4igBi/I6TnnqXc3XiyWznqLIlq6qs5DFk/8o2XYS l2IEN1qbchsnc/BntqwEEwPwD0K8orAy1K2TrSwGSRtDfoG4tmDWBdWO3S6/qi4D/4mE KBxaGGHXp7ANXWif+gaVgZooKihl+tVtOJaLkJKXjW15Y2ZQIXo+Sn93fh/p2fiaewFC G228xNJS1WPex+NuuzetWkTmOUm+eECOdPPKhlLAiEaCpCSmIOCBUGp9vBGnHEzsuEUh 9lGX5gL2to202KZtswjHdR0Z44HWvplK92ZBeQ5Qu+jagLtMk7kOMrrpmGOr90lhSATk UXrQ== 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=w06Vp/15rtKMAtlllomumaQDax9HQ8QJq3O3UNgHBd8=; b=HQAO5YbWXIt6nsk/KuS7ogRlkYmJwOv0nXkpB9SU4YRUJVmyKFyD2pLlcBH9Rh09kV voqiPyKNol9KknbZLRQmgW6E0fdsJ2YexFIrZUHQtsj9uD7EnAkAMQpHw4G6Aw5tJnwI EIxDjhPHcKpBwNsoHq/RjWHxH3kFvWRCrOB3dtcUl4DXXDSqrWAkLcuMuCFMPlQp20NH WTRbgnp+9w+tBUp/hq5vaLjcIw5rWvRRp2m5u13KsAylDMyST53rJHUdV7gahIWgQGT1 8id6miKnrd7fEGQ9ygUpUn5Pd0J+kK1KX8DzqpBw3uJVdBomn4Dtbr7yHY61LVe8YSus +DMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=IZyYrUIv; 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 n10-20020a170906688a00b006f3a3c6b04asi3790811ejr.295.2022.05.05.22.57.49; Thu, 05 May 2022 22:57:51 -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=IZyYrUIv; 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 6CD2B68B373; Fri, 6 May 2022 08:57:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 874F068B2C7 for ; Fri, 6 May 2022 08:57:27 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651816652; x=1683352652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sfhbmiF/wSMTpsfhhslyMov7B0k8aVFY/omlPmBxAOA=; b=IZyYrUIvalJR4pClIVOEVRYgjtXvulBSbUEQfp3rBj8yX74gz0/YGUEr CO58SACgbIJOR0Zq4Z5hDsOg5vVG3u8ffecvWtz4ebTopJhfeOVr/6+s1 NVIctX29JNZGnmSTSzDU3WTtxvZtSj4SgXVFxOrvaNmIqdSQRJ7D6kXHD LSHwpkns7Onxsir5jRn4IvbhZg03cpESSMsNEZh3r746uthyzlEDMu8eH 89jZUzyFZ+FyxAfWtgvuE9YXLvUwFHRetNsg1RfEzDWNF0PzHOppSXCZO RvzluEHspJQ6D6hjxhccod56jcsOMV0fzhElzaxY7833aR6aiCkaYThsK g==; X-IronPort-AV: E=McAfee;i="6400,9594,10338"; a="267201063" X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="267201063" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 22:57:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="568953784" Received: from gtapc.iind.intel.com (HELO localhost.localdomain) ([10.190.234.85]) by fmsmga007.fm.intel.com with ESMTP; 05 May 2022 22:57:20 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 May 2022 05:57:11 +0000 Message-Id: <20220506055711.1671-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220506055711.1671-1-tong1.wu@intel.com> References: <20220506055711.1671-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: w4jhNWIzVKVk 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 bf150c8553..5bff2dbcf2 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; }