From patchwork Fri Apr 29 10:45:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35507 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp212342pzb; Fri, 29 Apr 2022 03:46:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWubf5oep1HkEmznCTZid5mThclG1+BfNPDdl0EpTQnQa0oN+qr7hBqyNbb6rhM7OWynxr X-Received: by 2002:a50:9985:0:b0:425:c2dd:4cf7 with SMTP id m5-20020a509985000000b00425c2dd4cf7mr37164263edb.19.1651229171417; Fri, 29 Apr 2022 03:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651229171; cv=none; d=google.com; s=arc-20160816; b=UhEcIrFuiNJklx86h6+SDCXJdJPqeGL/1oZJoL8xox6yL5wemeYA8z36KZf5YFmcH6 Wy2bg5dAseakwLt+HcXQuFhx9gFYwi9QsjjeiLgPLX7atp8pCsvCwNBfJ8Me0myAaTYG WOHflIHc66iqLgoY9I1qat2wsCpGa95SRXJBmIshF0ucERQX0PN9ccNuV7yGMMFu20lU TCfgw9iiGug+TIBkUJ4KFgq+h8jWzXKg+wl5IVjxNzTHpJCEz7auWJDDyJytYxXT85ED LsTYyHKEQjR1RXpB2DYWuOlrowZp1inm4bzvVn+nmiEELr6e9sck9+cI7YUcaMUdVRkZ Ls9w== 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=cQcCXzDIglX8x/xNDJ27/hwkcX6J1oYtJ3pePER4GeU=; b=gGJI3Z6w3ogDRavn08vwUd3LBN1PfMuXaXc1iE4bDIO5jL5O46wKburzc9ITVYUnpl dxefBryNM8ZDysyisMil9KSS1RA2WkNTE+VhpggxxYkjSzpoyIrbBFmcO+TM2B4wsBBV 7rLJ+afsDV2hfVZrD6l3EiGyA4iaiQwrPkzEmF/Xhbh/3exCxC3Atm76ifxprKukreUI QMy9AJ+vhSp8xzl8XpVBCgc/yX2tm8ox8ENjjvk3CugLEXuFWVyQbCykqEueIr23lvzG /nPkw2do3WLhLg6rz92IC6sgt5thqyoPH6xCs34bQmdvHucqk1ec8O9oEk+tN9RlncPq FUyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=eoMWLTd0; 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 ta23-20020a1709078c1700b006f3aac86a91si5359002ejc.674.2022.04.29.03.46.11; Fri, 29 Apr 2022 03:46:11 -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=eoMWLTd0; 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 39FF968B30C; Fri, 29 Apr 2022 13:45:35 +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 7FDE068B272 for ; Fri, 29 Apr 2022 13:45:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651229133; x=1682765133; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hPm7cRHyyVal2zjMWPwuMciP5ZtBx/Kb7mLykG7HOgg=; b=eoMWLTd0SzFKmu9y0sbz+Ek4MABrIMW2N/y2DG4IU07MVJW8KJSiur52 S6NHzOdXJ6Twkb9CWZBOlW3JcTnCHZLeRIyN626FTh2iRvtLLFSMRfInH vcrsnen34CSsWh6dNoW56WERuKppGlJPg6vP0Bbc5XTqdI2cCjenXrwLE PA1v75E0qG0oI4SHCuxAe+9TB4cqgQZaGGKTqipXvQIvcnCFaR/VjQdzX 85Rq+0S+8tS6KYXrjIo8vPbwe+ADgBkXlagD16UlUvC2uFHbqPk/p6mEU CVJ3h7q3S39fI2sxUBjzZ9Vt2khc2QVs843/WhaqjL1046WljBiTIKVBS w==; X-IronPort-AV: E=McAfee;i="6400,9594,10331"; a="329548335" X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="329548335" 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:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="566080525" 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:21 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 10:45:05 +0000 Message-Id: <20220429104505.1747-5-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 5/5] 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: wY8Dk4n5bXKL Fixes: $ ffmpeg.exe -init_hw_device d3d11va=d3d11 -f lavfi -i yuvtestsrc -vf "format=nv12,hwupload=extra_hw_frames=16,hwmap=derive_device=qsv,format=qsv ,hwdownload,format=nv12" -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 6bc920ef59..1bdffee4a4 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1363,7 +1363,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; }