From patchwork Fri Apr 29 10:45:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35506 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp212278pzb; Fri, 29 Apr 2022 03:46:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycD86DiX0jKWsmZhe9Yv2jUPdpQjVOsvRXHJKXzAgKQKDbQfunNJ/r7A6eDSfYOfhSBS7/ X-Received: by 2002:a50:9985:0:b0:425:c2dd:4cf7 with SMTP id m5-20020a509985000000b00425c2dd4cf7mr37163637edb.19.1651229161015; Fri, 29 Apr 2022 03:46:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651229161; cv=none; d=google.com; s=arc-20160816; b=zzJdbrrZCLKs0+VMmejj++KGm2yf8MdwtpTBtjWqWonSuZxKIG2SfSdRY8Wdpbtvfb UU2fZIT5tq9A8RsOc5xu1yBUqExiflZQKYgpkuCxLAfg7I2fjFxdOi5FPIZkMl88qWFc SZLU6THZtLkg/9pvp8Br0H5LSaQQZyUk+l6Mh4hqBCVzId+ovmFznJsVTrrMxDcsGPOi obs0jZmGAlw7x+NEwxTNmPChSorr/kkRg7KvPPOT5co5/un7UzNEVYc84B1pkruha0sE 4qYEXXVKVv2xJQc7eN9qnXehIJbCSZOJpMgF86tB0ttsrlhWeOPM5pfhMA8b8rvFslxx NMVw== 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=Mu37kVnlq3+Hd0fJMTsWPv7Jn1l2yyv7KtkgJjp6EIk=; b=iVTRF6TNx57tkuhvYtFnUuKtOZWeJLATwJOdEmsrhCWjHWU2p6wJq34HXtCmiOfVGV GNY9gyHTsAqLmexGU/Pue7iz4NWHQXkpZYWSeje+4WQcCWlsg3VNJNMff0AHoTSVs7k/ VISTP37iDflKLSxb/SfL/EMTKJs+zPZy+JGfzwOYEwZ4TvbEjhZQ6Nku8M2m8BElFvRw pBfN9VfPuL3+oZvd93jjbojFrarMv6fJFaw558pySZQNaGXLi/yHtKr4R34hI2klQUOP vCo2kUxoeL/T7t6+uSykELc9B3PmsFWUHZbPZOyX7aqiWB05JIxg53lw5qyhnt28hBmk mHEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=lezDPN2a; 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 s7-20020a056402520700b0042600b03337si6010585edd.469.2022.04.29.03.46.00; Fri, 29 Apr 2022 03:46:01 -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=lezDPN2a; 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 3858A68B272; Fri, 29 Apr 2022 13:45:34 +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 D67D368B2BB for ; Fri, 29 Apr 2022 13:45:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651229132; x=1682765132; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e9C1vP8NgnnNfZQzDyHeYAxB8Utt9cASHFgTPUHzycs=; b=lezDPN2aVeIUEnFRCX9PeE3PRT4p1V/uKGvD6fcIz0v56HPOgq0YY5aV ydoAtzn/qHfbiNgjq3rO5Uc+/pbcGXL0qt5OUH7L78mjyYZMP6FnWz8rz G3743G3KVYgLkofFZxQxD/8MqsNiCJ2NxHh+wovCL+osQIYAve6tbDU0O OYVciC1/Em6DD4wEn9cq0nShmodZxBt0Ma75BlieA3YWJutsFKOAVy5Ux B7Of/tkDwkqoJVFbb4XobneOBqalvzEQtUejDYCHnzOUq8hRyhXbQ3rTS lzC5VlOQjN2rXpBS7EM1mKGxx5fGt4E52X5LitsXRZptKakS6SqclA6AL g==; X-IronPort-AV: E=McAfee;i="6400,9594,10331"; a="329548332" X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="329548332" 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:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="566080510" 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:19 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 10:45:04 +0000 Message-Id: <20220429104505.1747-4-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 4/5] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eNqQd0W/YCVz 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 d9d05e936a..6bc920ef59 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -915,7 +915,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; } @@ -945,7 +945,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; }