From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4A17748CD2 for ; Fri, 23 Feb 2024 14:12:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E52D768C601; Fri, 23 Feb 2024 16:12:11 +0200 (EET) Received: from out203-205-251-60.mail.qq.com (out203-205-251-60.mail.qq.com [203.205.251.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 802E768C5E6 for ; Fri, 23 Feb 2024 16:12:04 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1708697516; bh=4Fj7AL3sMcOcJY4wlqbwl+KWiTs8OZSWUGL67dtZftk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XDX3K/qoZAA02Z5Bm8Zjp4iywRQ7c/SFDMWfkuI0Qqns3I9GdFITOfi5dgEevWz// vpp1X9XZdCFR6Gcu0BUbRx/Pu1Ds36vxwRVvQy1comSnfbyZLgaW5CezuZ1WxycGk5 dU6mlPMWrXDPCM7KP2JTiW/JZdxkWuPOT281O9Xk= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.198]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 2F18B87A; Fri, 23 Feb 2024 22:11:49 +0800 X-QQ-mid: xmsmtpt1708697510t5bjpjf3b Message-ID: X-QQ-XMAILINFO: N4CzT1PKe+qFHsrQwYIuRQcMtHjSY0t/hMe1Kqsf5a+h1Qt8C3FGOmcauWhafP O8epPPUQsxCb/nYCN4qCggJHrGALf3Fa9oLHTh9iLzwJ2kI8FnSJXTk56YXPnzFCVyS481brep26 MhNmnisw0WnbhJCqVbcAVyOY+Ui6qTtxfDNnw02FAiD70u7hG9655RPgMQQL4PNXyzlCh0fqjX8W o5ZJf2exGSVcbeqJLZBmPeUcsUAbKDC5TqjOOhvEjn/Jz8tH7rrEgZwHpmnnT+t9YIwWgxxexB7b vGVfEtbvmYdTBfaTE3m64Ighq9+QvlzCYEeyg9Aea0tchf5BRVwYMvVwd9iiiJ9qAnD8ByiC5FAR JYjrOdI0wIFDRtsKGj7CubcDEtfZmlxa5J9IKOTLok3tWNlUU1/aUJTx9vJ/fOyJh2OB573pWSAx DwCDag02ugoggu0uJKkigPZmi3mMU3miMHhmnY0nUMb9TNvEFffMVkcGa9HQ4a2brpY4gpF4qYya CzN2xNqO5GV3QDWkvVLHIKttAq+Qjtw0DUfIWipLREpNlfj9BZqez5qJ4I3qIn8LoyqNYTVDZYM8 hFIP3K3VBr6QM++ebIYgJFiEm0SgSRJf+VPPAuwf/krFB3XFhb6RZzM5lYJgJjuHgRlb7VwzZTBu aS3lnMOFmgD4pm3VJVKTDI1x3cnstWz0yt0ovu3vOHDCHMibmD5bz3WLt55fN5EzCMFVKiDpjzNx rfdZ4fslQ+4EdxOTWAWdJxegpA3XDgnsUfE4VZd/6Yj29j4vWwjMWyGKSuu5xV3YblPwCwqF0She 6naNH+sJ5onAjpxWMH4aT7tFcdyMMr8yVGCfCX/3GT9j22yCNTAJFY7CV/pCxO3oNj9pPBvbGkzN O7GwaFyKaSVufc3JsOl+U6R4cnQZaQ3UDYEcjHaL0GpizDjgqfksPWLeTSqT8rbPcQ/LNrHWqeOq AoOBnfB7RzGjjJQ5OoNXt9ZG05zUqR2rFYf7+vWWgevQiAmd8JEtI3gWN3cDV0 X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 22:11:43 +0800 X-OQ-MSGID: <20240223141143.16065-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223141143.16065-1-quinkblack@foxmail.com> References: <20240223141143.16065-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/hwcontext_opencl: Add map from Videotoolbox 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: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili For example: ./ffmpeg -hwaccel videotoolbox \ -hwaccel_output_format videotoolbox_vld \ -i foo.mp4 \ -vf hwmap=derive_device=opencl,transpose_opencl=dir=clock,hwmap,format=nv12 \ -c:v hevc_videotoolbox \ -c:a copy \ -b:v 2M -tag:v hvc1 bar.mp4 --- configure | 6 +++ libavutil/hwcontext_opencl.c | 97 ++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/configure b/configure index 197f762b58..efcb4c4e49 100755 --- a/configure +++ b/configure @@ -2460,6 +2460,7 @@ HAVE_LIST=" opencl_dxva2 opencl_vaapi_beignet opencl_vaapi_intel_media + opencl_videotoolbox perl pod2man texi2html @@ -7217,6 +7218,11 @@ if enabled_all opencl d3d11va ; then enable opencl_d3d11 fi +if enabled_all opencl videotoolbox ; then + check_func_headers OpenCL/cl_gl_ext.h clCreateImageFromIOSurfaceWithPropertiesAPPLE -framework VideoToolbox -framework OpenCL && + enable opencl_videotoolbox +fi + enabled vdpau && check_cpp_condition vdpau vdpau/vdpau.h "defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP" diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index de093fffb1..efd8d0e094 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -72,6 +72,11 @@ #include "hwcontext_drm.h" #endif +#if HAVE_OPENCL_VIDEOTOOLBOX +#include +#include +#endif + #if HAVE_OPENCL_VAAPI_INTEL_MEDIA && CONFIG_LIBMFX extern int ff_qsv_get_surface_base_handle(mfxFrameSurface1 *surf, enum AVHWDeviceType base_dev_typ, @@ -1364,6 +1369,12 @@ static int opencl_device_derive(AVHWDeviceContext *hwdev, break; #endif +#if HAVE_OPENCL_VIDEOTOOLBOX + case AV_HWDEVICE_TYPE_VIDEOTOOLBOX: + err = opencl_device_create(hwdev, NULL, NULL, 0); + break; +#endif + default: err = AVERROR(ENOSYS); break; @@ -2819,6 +2830,84 @@ fail: #endif +#if HAVE_OPENCL_VIDEOTOOLBOX + +static void opencl_unmap_from_vt(AVHWFramesContext *hwfc, + HWMapDescriptor *hwmap) +{ + uint8_t *desc = hwmap->priv; + opencl_pool_free(hwfc, desc); +} + +static int opencl_map_from_vt(AVHWFramesContext *dst_fc, AVFrame *dst, + const AVFrame *src, int flags) +{ + CVPixelBufferRef pixbuf = (CVPixelBufferRef) src->data[3]; + IOSurfaceRef io_surface_ref = CVPixelBufferGetIOSurface(pixbuf); + cl_int err = 0; + AVOpenCLFrameDescriptor *desc = NULL; + AVOpenCLDeviceContext *dst_dev = dst_fc->device_ctx->hwctx; + + if (!io_surface_ref) { + av_log(dst_fc, AV_LOG_ERROR, "Failed to get IOSurfaceRef\n"); + return AVERROR_EXTERNAL; + } + + desc = av_mallocz(sizeof(*desc)); + if (!desc) + return AVERROR(ENOMEM); + + for (int p = 0;; p++) { + cl_image_format image_format; + cl_image_desc image_desc; + cl_iosurface_properties_APPLE props[] = { + CL_IOSURFACE_REF_APPLE, (cl_iosurface_properties_APPLE) io_surface_ref, + CL_IOSURFACE_PLANE_APPLE, p, + 0 + }; + + err = opencl_get_plane_format(dst_fc->sw_format, p, + src->width, src->height, + &image_format, &image_desc); + if (err == AVERROR(ENOENT)) + break; + if (err < 0) + goto fail; + + desc->planes[p] = clCreateImageFromIOSurfaceWithPropertiesAPPLE(dst_dev->context, + opencl_mem_flags_for_mapping(flags), + &image_format, &image_desc, + props, &err); + if (!desc->planes[p]) { + av_log(dst_fc, AV_LOG_ERROR, "Failed to create image from IOSurfaceRef\n"); + err = AVERROR(EIO); + goto fail; + } + desc->nb_planes++; + } + + for (int i = 0; i < desc->nb_planes; i++) + dst->data[i] = (uint8_t *) desc->planes[i]; + + err = ff_hwframe_map_create(dst->hw_frames_ctx, dst, src, + opencl_unmap_from_vt, desc); + if (err < 0) + goto fail; + + dst->width = src->width; + dst->height = src->height; + + return 0; + +fail: + for (int i = 0; i < desc->nb_planes; i++) + clReleaseMemObject(desc->planes[i]); + av_freep(&desc); + return err; +} + +#endif + static int opencl_map_from(AVHWFramesContext *hwfc, AVFrame *dst, const AVFrame *src, int flags) { @@ -2864,6 +2953,10 @@ static int opencl_map_to(AVHWFramesContext *hwfc, AVFrame *dst, case AV_PIX_FMT_DRM_PRIME: if (priv->drm_arm_mapping_usable) return opencl_map_from_drm_arm(hwfc, dst, src, flags); +#endif +#if HAVE_OPENCL_VIDEOTOOLBOX + case AV_PIX_FMT_VIDEOTOOLBOX: + return opencl_map_from_vt(hwfc, dst, src, flags); #endif } return AVERROR(ENOSYS); @@ -2922,6 +3015,10 @@ static int opencl_frames_derive_to(AVHWFramesContext *dst_fc, if (!priv->drm_arm_mapping_usable) return AVERROR(ENOSYS); break; +#endif +#if HAVE_OPENCL_VIDEOTOOLBOX + case AV_HWDEVICE_TYPE_VIDEOTOOLBOX: + break; #endif default: return AVERROR(ENOSYS); -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".