From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 440CC4284B for ; Thu, 5 May 2022 10:54:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A39568B3C8; Thu, 5 May 2022 13:53:49 +0300 (EEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 827FD68B3AD for ; Thu, 5 May 2022 13:53:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651748027; x=1683284027; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=27z3tC3TEQbbH1SW3iptpsBSNTtFzLh5nc/CyexCvro=; b=PvL05S37wm0yxBXGea9pQri1QY2ndC83GY7Rt1ytejzgNgPURfP0a2kl TWBiGQLtS22smP7MaRAkOYxEzK5T7h7SBK+Lx7UJoxursCiIZ1WSoqcnJ IszT/us4vjRviKprqnenXjpruikbwrJHkWEDaB+yDY/xJAXVh4kLfF+xw XonN5B6vjghE4WpznuroEpEAFDuM8po9NSCgdibzolT8WoJcOq/YwnLcm OwASkUIeA6ZcdvdqxsufuRxMjIIvO2gJRi6kpbeljMNWqXTh26F26pDoz MyLrT1LpljWUczVRXOJM7SiImI2FeebaJuqE8xhtz11+nsSeYnr3RAGfy A==; X-IronPort-AV: E=McAfee;i="6400,9594,10337"; a="328612322" X-IronPort-AV: E=Sophos;i="5.91,201,1647327600"; d="scan'208";a="328612322" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.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="563187288" 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:29 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 May 2022 10:53:17 +0000 Message-Id: <20220505105318.716-3-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 3/4] avutil/hwcontext_qsv: map 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: When input is a rawvideo, after mapping QSV frames to D3D11VA frames, the output will have green frames. Now fix it. Fixes: $ ffmpeg.exe -y -init_hw_device d3d11va=d3d11 \ -init_hw_device qsv=qsv@d3d11 -s:v WxH -pix_fmt nv12 -i input.yuv \ -vf "format=nv12,hwupload=extra_hw_frames=16,\ hwmap=derive_device=d3d11va,format=d3d11,hwdownload,format=nv12" \ -f rawvideo output.yuv Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 65af7130b8..27eedef5f8 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1388,7 +1388,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; } @@ -1418,7 +1418,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; } -- 2.35.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".