From patchwork Tue Nov 30 08:44:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 31834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7352403iob; Tue, 30 Nov 2021 00:48:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdq9fLV7xtW/4l46Q/wYWAIHJrEq7j+jQeM8xnWwnJfVJr1waXeu2YvjgBX4QZBEaYMX73 X-Received: by 2002:a17:907:9487:: with SMTP id dm7mr67331899ejc.2.1638262119587; Tue, 30 Nov 2021 00:48:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638262119; cv=none; d=google.com; s=arc-20160816; b=g+nrd/1ROHXlnbm7CaO2N5DDuXdK9DPzGhrpcutzt71TDrTy+ga1GoxUq/7a7NF0+D FOeXPSXKGZbTCS7UY9gO27a0hH/XT/XsfOk3tgLrNg1jown+RF8OtBkbdDm/raM8M4VP S4+PXcz1ftGgbILbdXMbmlns3ois8ixZ/8WYcbXzwsbjrKpBbxXiuKhBKGploPznaz2f DiVSFUsihmTZcJ4lKOOheAMJ5Iev69rd8/vSOOL4gaOGqRwoM5nQ0XXA1YtxsmTH63Dt J7LmBGA3tFQFUCIOtqpydTeT41ZBIfyrXNX9tGIbZZvoAT3bwLxsXJLS6/AaCXyPxtZX dKdg== 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=YUZRkNS219edC1ivq1QQH8F3hEA2jYTTsW9TsDA9OTY=; b=KG2/4FqyVRxKa0O0VLgG4LjTm3SShU6NkqlUSOdRqiSNLNAApVWGFgadK6PpGy8qqT 94u7ZRh3bn9eeU6SwWxqrvzzFTtLpa/OYuJC70jpw1T61ij7RFcBQQXvc0W1ndlaQMeI 3RdgE8fSrIgg7HQRNrt5nJ4RemSdmmkpjZAZvypKQOtfyaou+h0Ljbqb7WUL1sChDQ2R zU0yzUEGkROH9lv+jOHqJYDxComnnobUyoBikF5tqIP/TIS1TDbXgiI1qwHjSVogwqdd ugVSI1ZxIsOXr/4QkKusc9wuTGU/DOFp2vpw/Dh/3AmZRHfmZNSwiT7sDZomoikknJ0/ Mhtw== 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 go42si26044312ejc.556.2021.11.30.00.48.39; Tue, 30 Nov 2021 00:48:39 -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 34A4F68AE68; Tue, 30 Nov 2021 10:48:24 +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 67BDC68AE42 for ; Tue, 30 Nov 2021 10:48:16 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10183"; a="299567450" X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="299567450" 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:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="676745654" 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:07 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 16:44:06 +0800 Message-Id: <20211130084406.758250-3-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 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: fxqaiMH3RZnb 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 ++- libavutil/hwcontext_qsv.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 26a3a24593..ab812999cd 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -48,6 +48,7 @@ #if HAVE_OPENCL_VAAPI_INTEL_MEDIA #if CONFIG_LIBMFX #include +#include "hwcontext_qsv.h" #endif #include #include @@ -2249,7 +2250,7 @@ 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; + va_surface = *MFXSURFACEP_TO_VASURFACEP(mfx_surface); } else #endif if (src->format == AV_PIX_FMT_VAAPI) { diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h index b98d611cfc..957df01ef1 100644 --- a/libavutil/hwcontext_qsv.h +++ b/libavutil/hwcontext_qsv.h @@ -29,6 +29,11 @@ * contain AVBufferRefs whose data pointer points to an mfxFrameSurface1 struct. */ +#if CONFIG_VAAPI +#define MFXSURFACEP_TO_VASURFACEP(surf) \ + (VASurfaceID*)(((mfxHDLPair*)surf->Data.MemId)->first) +#endif + /** * This struct is allocated as AVHWDeviceContext.hwctx */