From patchwork Tue Nov 30 08:44:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 31832 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7352272iob; Tue, 30 Nov 2021 00:48:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxXg8F5/zlt5U6jttlq0lA/+HuNNKQaq/CW4anRYg2/DqdazX+vIGonxU0fR5seXHzlX2n X-Received: by 2002:a17:906:f856:: with SMTP id ks22mr63892924ejb.367.1638262109494; Tue, 30 Nov 2021 00:48:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638262109; cv=none; d=google.com; s=arc-20160816; b=PxYPyKY7o3uoYz6OCMM1R0KqWIshG3Bf0Y0Gi8pcfUR2Db0JF30mTbTBLBheNr+Kf1 Tz8nynYn8sghefqZ53QDDdho7H0iFHdklvY1enktnxWI6KueMi0Hb9rM1CMB8rJ6oEph e/j/CKKVoYThDX9pjf5KQA1B6bLZUVD/TWmUCqWglCazq5dKjIzZNJYcksNPFIqs/PxC xiJkPWThvS1Km4/9PZ9CuUTvpdvUm5YXxL5V6k4BXED9KvCyYH2zi8M2lyv55yyj4QQ1 eZBqL1Mqab8JUQb9TAliGw0HfsiL3dkkIAAK8Qe/mDPfoHWswHjILRhkSqv3IJRfEHtY bieg== 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=aasyRZVDK1ExXiC52rWOasjH1pZ3hkrCp04d0ad0c+A=; b=b47hmdV7f9ZFJrhD+af1s4SgJXOArzIfeKSwJfpzDj4QgvqtLY9HQfr6NwNZge1rpU RWv1VON2LC2bigNUJXp45lviasT6KS5H8J09YuX4FH53ZyK9UQAzAhMn9Q5bPYs3xVl3 da0VTzBp9KjRBpsjZnZuXfY6+f+4AOD1oOnsjpmfpNi2sIY2nBfrTvwkcJvO/9ozqB64 nJ9RxnPBQ4A4paRCjpBr2qRvoCkU2aRwkLaMjhiKz1ijEnnKMGhb7BBWtl3tpWZUQS/L DqArxYl1Rq3jEgMAirpzoQe1bU40C5jwUHOuTG8zAJtOz1EWfbSgppwibNsGJ7ljqi3l 6pGg== 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 cb17si22899936edb.493.2021.11.30.00.48.29; Tue, 30 Nov 2021 00:48:29 -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 2AB7068AE97; Tue, 30 Nov 2021 10:48:22 +0200 (EET) 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 15E9868AE0F for ; Tue, 30 Nov 2021 10:48:14 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10183"; a="299567449" X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="299567449" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2021 00:48:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="676745644" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga005.jf.intel.com with ESMTP; 30 Nov 2021 00:48:06 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 16:44:05 +0800 Message-Id: <20211130084406.758250-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211130084406.758250-1-wenbin.chen@intel.com> References: <20211130084406.758250-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 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: 32O+SlQYONCE 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 268be9f8a1..a5d154a24d 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1218,7 +1218,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; }