From patchwork Tue Nov 16 08:16:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 31441 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7038280iob; Tue, 16 Nov 2021 00:20:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwluAY5UzHQTgOl+EJIlVbT3c8SVfrBvlwnYc0qAfjtDv2k7ARfg8a+ZGSEl+VH09Uuwzl X-Received: by 2002:a17:906:a14a:: with SMTP id bu10mr7508374ejb.540.1637050837567; Tue, 16 Nov 2021 00:20:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637050837; cv=none; d=google.com; s=arc-20160816; b=nJBPok4DKtIWNrBLGkmH4qL8Qww/2wBc38JccUmTyBiqWiXzi8eclfm2GSUAGM3eQd VawRtDB1sFgQjhm/nOlYAYkGVoL1jhjDO+lFoGneTNlcT/XecCAlwrOm3a2lKBKrS8VQ f8Ew56UI3EuARknPtWM1ytPVPmlYTfO1J68lfeMhO3z64zPvhekPZ18uw4M+wsQAEK5j NaKW3ite8kIT9QLgQBPHQND9Ga+02T1AootmFEXhxwcxcYEF8pQGbsOixaZD/aGVNcLQ nQHVdD+HRusTM4gM+E3okbVWXQkKTvrV2Ki1zGS6yk1cyxQvD8EBupIPj9SwFh8NHyyz sMag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=2RMMfbrn59hkM0xxLM/w+2DWEaviSQ8D/6YtHMxSN7Q=; b=NjElOdRJvAL8GrDewAWzuzIyAa1C0DrKG24Gh9/YD3kKw0rW6k1nbwhJWzWiVY26ry 2VdUlE/ijFLn+bgVXgd01TztIeQDTTWk8lkkoEnLlvbE7PrxWXUZ9iLVdp6sQt42/+Jy 3UOvGNyQaq2C03TciyuHY2TpL0bA02YN2I8/t3lf2ba+Ec8y763ARKZTnTiL0SZuiLX4 RDH99HLofEU2KTeDMePp71/FrGntfNHTbFgbcv3yuM2jd+BVkQZHOvcz38MK8CO0fuFy AGsS10l3FQJuAmi2bHZvaToq2iBBFXj4tfWjbePSfdciIsxDPoS6oIYpCJC0plKOJmal TbUQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fy1si13423082ejc.556.2021.11.16.00.20.37; Tue, 16 Nov 2021 00:20:37 -0800 (PST) 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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BEA06801E6; Tue, 16 Nov 2021 10:20:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D38C168ABD1 for ; Tue, 16 Nov 2021 10:20:22 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10169"; a="233482531" X-IronPort-AV: E=Sophos;i="5.87,238,1631602800"; d="scan'208";a="233482531" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2021 00:20:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,238,1631602800"; d="scan'208";a="454362230" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga006.jf.intel.com with ESMTP; 16 Nov 2021 00:20:14 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Nov 2021 16:16:22 +0800 Message-Id: <20211116081623.3081766-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211116081623.3081766-1-wenbin.chen@intel.com> References: <20211116081623.3081766-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] libavutil/hwcontext_qsv: fix a bug for mapping vaapi frame to qsv 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RxirUlFHYYxf From: nyanmisaka The data stored in data[3] in VAAPI AVFrame is VASurfaceID while the data stored in pair->first is the pointer of VASurfaceID, so we need to do cast to make following commandline works: ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 \ -hwaccel_output_format vaapi -i input.264 \ -vf "hwmap=derive_device=qsv,format=qsv" -c:v h264_qsv output.264 Signed-off-by: nyanmisaka Signed-off-by: Wenbin Chen --- libavutil/hwcontext_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index c18747f7eb..d83754193a 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1220,7 +1220,7 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx, case AV_PIX_FMT_VAAPI: { mfxHDLPair *pair = (mfxHDLPair*)hwctx->surfaces[i].Data.MemId; - if (pair->first == src->data[3]) { + if (*(VASurfaceID*)pair->first == (VASurfaceID)src->data[3]) { index = i; break; }