From patchwork Fri Jan 7 07:36:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33144 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp163290iog; Thu, 6 Jan 2022 23:36:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJy8KIp0FpmIAwTwb8TIRIwAMaWLjiav4r+ds8f+6Aydo/cw6c1NAcmAebzgmmULz3lmW1rn X-Received: by 2002:a17:906:6d95:: with SMTP id h21mr42148564ejt.190.1641541015187; Thu, 06 Jan 2022 23:36:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641541015; cv=none; d=google.com; s=arc-20160816; b=AmYs4JrvTAQYDtK5G8LADdQmglTel5QTdqI01AnCE3zcbx54fYcF9z3NkJP9ms9/9D z4oGJ4XyxzMT0ITZqomZOsLXqLxs3ZEQlYHyVr3BLckorQeoGcAmXEI8O1N32K7ACFvi lBpMqieFAyF5MTo06YneBmTBBrZtd5Iq9aUIDhZIKurGpIxNX69CtYYBtxPDS+/lY9yk vjhEM4DE15n1aX+jSFAdc+KiJqTUSJ1CoANo3NAs4GHzhL31dt+6HMaVKi3Umkq2yoIn ofcGLuNAKvUGJ5orLmgRjfgDd1yBv7AQ/24dKWzh0QD3eLNt7UHuzRmKNmzQTdGRNhW8 VuSw== 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:dkim-signature:delivered-to; bh=FOmS4wPZRfaR0n7eE6n41FsnHaJMimQhCmcuVRa0nvs=; b=bQfftNEdkylLgH/ycdeACVsaERz64Q+PoPoJTbCE74wIfyoVWNyTD/MjK96WdQCvFY mo91Z/C8Z958ZTeiqAmqP9NXb7lpIbJxGsbu5eETlDcRCXt5SCI8/syDYibX2Tv6ItVH gZZ7F0EsgjcfN7RuzLiMreWXZZu87n+RhcmbvUuUkemt489HAQ5tYgeKsvzXX+9ldLvI 63HHkGPBOEJ81feL8mmb8V0Cbg9UIwOloyzzYDPW58oczZdcNW5I3dFxFBxyr05Yu/DN 6XigKRxKlWKTZx0Kwd62v8DHwm3EQCTnoCi8lCBrIBsRiChpe0LqVFIfrWSRUxpnjoBC wB5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Vp6oubkE; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id do17si2204253ejc.353.2022.01.06.23.36.54; Thu, 06 Jan 2022 23:36:55 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Vp6oubkE; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 869DF68AE4A; Fri, 7 Jan 2022 09:36:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D204A68A2B2 for ; Fri, 7 Jan 2022 09:36:39 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641541005; x=1673077005; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Wo7sCLo3eNJofh0yoEggjmEmoPWQu6MJZje6ISbsUBQ=; b=Vp6oubkEAePUT8N/ldXE1xQLgeio5emvO4lSvKO9DgSxtHlZmJl3u5L0 yxsZn4wmgFbg8ND+xaL9roRY7OEQ/KEG00XGbm9eUsRIFX7h1ovKg2M98 VlfzsbxJ1EfYCFco+2hLUYHOYGHVUSmsNaRyQGgGUGjyPft/DGgGJiehC P+cP1FAXqGfJSodhslSu1xWdMltpT4PPIqdSeXNE0GbS6mB5lwACJA5Mt xE7GedCKUK51EBGyL4V5mK50TCRBLEAwSczQC811x/ESwvrv8njdgkc4i kaidQvzoZG9sDl27zBvCD6b5xkeO1pR5T8UqSAcJSvLp8/YcQMjWi+rys w==; X-IronPort-AV: E=McAfee;i="6200,9189,10219"; a="241639966" X-IronPort-AV: E=Sophos;i="5.88,269,1635231600"; d="scan'208";a="241639966" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2022 23:36:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,269,1635231600"; d="scan'208";a="473232114" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga006.jf.intel.com with ESMTP; 06 Jan 2022 23:36:31 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jan 2022 15:36:22 +0800 Message-Id: <20220107073622.1177322-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220107073622.1177322-1-wenbin.chen@intel.com> References: <20220107073622.1177322-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V4 2/2] 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: I8PLP+sI056d 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 | 14 +++++++++++++- libavutil/hwcontext_qsv.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 26a3a24593..ceaef26f1c 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -72,6 +72,12 @@ #include "hwcontext_drm.h" #endif +#if HAVE_OPENCL_VAAPI_INTEL_MEDIA +extern int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf, + enum AVHWDeviceType base_dev_typ, + void **base_handle); +#endif + typedef struct OpenCLDeviceContext { // Default command queue to use for transfer/mapping operations on @@ -2248,8 +2254,14 @@ static int opencl_map_from_qsv(AVHWFramesContext *dst_fc, AVFrame *dst, #if CONFIG_LIBMFX if (src->format == AV_PIX_FMT_QSV) { + void *base_handle; mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3]; - va_surface = *(VASurfaceID*)mfx_surface->Data.MemId; + err = ff_qsv_get_surface_base_handle(mfx_surface, + AV_HWDEVICE_TYPE_VAAPI, + &base_handle); + if (err < 0) + return err; + va_surface = *(VASurfaceID *)base_handle; } else #endif if (src->format == AV_PIX_FMT_VAAPI) { diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 853fb7f60d..6d9b8324c2 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -112,6 +112,40 @@ static const struct { #endif }; +extern int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf, + enum AVHWDeviceType base_dev_type, + void **base_handle); + +/** + * Caller needs to allocate enough space for base_handle pointer. + **/ +int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf, + enum AVHWDeviceType base_dev_type, + void **base_handle) +{ + mfxHDLPair *handle_pair; + handle_pair = surf->Data.MemId; + switch (base_dev_type) { +#if CONFIG_VAAPI + case AV_HWDEVICE_TYPE_VAAPI: + base_handle[0] = handle_pair->first; + return 0; +#endif +#if CONFIG_D3D11VA + case AV_HWDEVICE_TYPE_D3D11VA: + base_handle[0] = handle_pair->first; + base_handle[1] = handle_pair->secode; + return 0; +#endif +#if CONFIG_DXVA2 + case AV_HWDEVICE_TYPE_DXVA2: + base_handle[0] = handle_pair->first; + return 0; +#endif + } + return AVERROR(EINVAL); +} + static uint32_t qsv_fourcc_from_pix_fmt(enum AVPixelFormat pix_fmt) { int i;