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