From patchwork Tue Nov 16 08:16:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 31440 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7038455iob; Tue, 16 Nov 2021 00:20:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5XFaUbKaX2xheg/WKIXc0bzH7PMdxzO6LazRmBxBBQm6DMwFaj0/d01LPNW2kU/xNCo9y X-Received: by 2002:a17:906:730b:: with SMTP id di11mr7439371ejc.97.1637050847537; Tue, 16 Nov 2021 00:20:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637050847; cv=none; d=google.com; s=arc-20160816; b=k8i8//XMI5eDqFFjZ+sgJUb8j86aznYXA4PcyVkadDPiGqDJ1xlzAwbiecZmjvrPpZ 4MbrdbfCIqA+kwUs1Rde7pItBr0rI0pTKajNzW5DmGvmRlo8fbgZj8WUdmliKZLqM25a NbXYHNCNlc07ZfjHBsxnL6qgXip4PrJhe5lZ64OuoOiObL5OhOrWfsL4WWF79+5g2jF4 iD6gZdnTts5k26ZV3cONqItokp3eQAz6Qc+5MOgmXM2ebkTGjMGdMWjBVCUyU11uQF6P Gg9yCBiS8D6eddwZ8NSHvb4wkM/TqBma5EyWdAFIsH/f90/boDQe/W6Y2IFYRbnifyv8 3jpQ== 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=kPZPPdpH5v6lW50leFe99JgWwLkHcvxUKfLcFnVaw3o=; b=D/bANrzIOGTHyAVfhZRvL1+PGbF84cBYCKckatiP7P9aRzYqbVK4PkiTZL3HylXKoC G0CB4HmtwCMM/QnL8+rbmkybjfPLU6VezFb4A4tDm1R8RuUbAboIXz3ST+2bOrGaR8sI xC0N8g/6UovWiG0dQaAnNhow/DqDJ9oq44wQZQRznCRCTr0w1pun6kZGpCur9qh9dbjX Wq8En//eK3ZIh3CqLR2cbQiP0sJoB7SYqxhDZxyAAiYzNA08I3it7SG8wrV1hhCAWD+H KsM45pga3lcME/yHcoC7AW1URnv4HLNY5t+rHY3PYeBhId0wL/w77vAQTEiCRfklk5vd qcuw== 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 kb28si31053604ejc.439.2021.11.16.00.20.47; Tue, 16 Nov 2021 00:20:47 -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 32F3A68AE6F; Tue, 16 Nov 2021 10:20:32 +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 37D3868011E for ; Tue, 16 Nov 2021 10:20:24 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10169"; a="233482536" X-IronPort-AV: E=Sophos;i="5.87,238,1631602800"; d="scan'208";a="233482536" 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:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,238,1631602800"; d="scan'208";a="454362238" 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:15 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Nov 2021 16:16:23 +0800 Message-Id: <20211116081623.3081766-3-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 3/3] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5oL1Q6e8I5Ap 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) {