From patchwork Thu Nov 4 05:44:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 31293 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp146567ioi; Wed, 3 Nov 2021 22:49:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW5BLTNBCITVU22cwuePFd18QDcs9Q4I1UWQiRA4BUIHs26B97OYNHZytl5qV45V8ifTk9 X-Received: by 2002:a17:906:942:: with SMTP id j2mr61721990ejd.303.1636004957494; Wed, 03 Nov 2021 22:49:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636004957; cv=none; d=google.com; s=arc-20160816; b=DTT7eUFIjyR4Op17QYUsQXSB1CKy24ugpB3nz/VPCJIX3fkUqNUviRRuYU3GE7vScV IRdO0NI7Ts0g8xhZkzppSWh5xNOdZFb2t+eqouHlvnIhTogKHcQtDhtcVyuRknNzVgl/ JPep3fBwVaDmKgTpVDRf/ubhIJjvEnSJ1okbFpOYAz0UMp4BA4D3i4ZpMHQEnwHqOUME KXFt+oZ6x4ctmATVC6R06Cmzz1JBZ/SozIqEwn+60rt1aRHqRzrNWtBsNfk8pPFllk8R 0DfrXlHpx6UyT+KchuCRyAoxGRbe12LDA8uHD1jQvT0rcbzNg/rp1cdsK4I/zoDlv9Xw 5hUQ== 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:delivered-to; bh=kPZPPdpH5v6lW50leFe99JgWwLkHcvxUKfLcFnVaw3o=; b=s0lTiOZsC2DB7TM0AQ1dH1ZJ0QV5Qqg+L5Ju0aG06RzHpTK3NTNn7Hqo1DnLPYdkbb rz+HqKig6msrP0Yj9fc/3SHXE5rDa03lWsB1JVBOb+FG5SKK6KFuyaaqc/XcLnyfdQ4D gZu3jD6Q0v0Uc2UQ5l7p4EXwGaFoYpPCiQczdizUbaOfjN6yeWJwZDMaM0mm6Ip8xHZ0 Xpf/ieT1brkE8AGD4cKcmZM9/T7RIZ2QDQEk7mvpbTgH2BoRzYdCmEf4gLf44J4Iceve CZeN7djgUVputV+VHd+BJUo9Sw1AmtoaXE8JtBzS2EJv1/rFpiuVuoWn0FgSl2vsYvEQ of0A== 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 x19si6863594edl.627.2021.11.03.22.49.05; Wed, 03 Nov 2021 22:49:17 -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; 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 837DB68ACE7; Thu, 4 Nov 2021 07:48:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 676D968AD2A for ; Thu, 4 Nov 2021 07:48:26 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10157"; a="212398289" X-IronPort-AV: E=Sophos;i="5.87,208,1631602800"; d="scan'208";a="212398289" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2021 22:48:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,208,1631602800"; d="scan'208";a="639158187" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by fmsmga001.fm.intel.com with ESMTP; 03 Nov 2021 22:48:21 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Nov 2021 13:44:03 +0800 Message-Id: <20211104054403.1251208-4-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211104054403.1251208-1-wenbin.chen@intel.com> References: <20211104054403.1251208-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] libavutil/hwcontext_opencl: fix a bug for mapping qsv frame to opencl 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: Wenbin Chen , nyanmisaka Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KoE+AM8fM8eP From: nyanmisaka mfxHDLPair was added to qsv, so modify qsv->opencl map function as well. Now the following commandline works: ffmpeg -v verbose -init_hw_device vaapi=va:/dev/dri/renderD128 \ -init_hw_device qsv=qs@va -init_hw_device opencl=ocl@va -filter_hw_device ocl \ -hwaccel qsv -hwaccel_output_format qsv -hwaccel_device qs -c:v h264_qsv \ -i input.264 -vf "hwmap=derive_device=opencl,format=opencl,avgblur_opencl, \ hwmap=derive_device=qsv:reverse=1:extra_hw_frames=32,format=qsv" \ -c:v h264_qsv output.264 Signed-off-by: nyanmisaka Signed-off-by: Wenbin Chen --- libavutil/hwcontext_opencl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 26a3a24593..4b6e74ff6f 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -2249,7 +2249,8 @@ static int opencl_map_from_qsv(AVHWFramesContext *dst_fc, AVFrame *dst, #if CONFIG_LIBMFX if (src->format == AV_PIX_FMT_QSV) { mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3]; - va_surface = *(VASurfaceID*)mfx_surface->Data.MemId; + mfxHDLPair *pair = (mfxHDLPair*)mfx_surface->Data.MemId; + va_surface = *(VASurfaceID*)pair->first; } else #endif if (src->format == AV_PIX_FMT_VAAPI) {