From patchwork Sat Oct 28 18:13:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp586953pzb; Sat, 28 Oct 2023 11:14:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZm2rnEIv1OMJRM47nlrijRElMSgagawSewDCJOqRj20MKIV4BjRDlVRJf4y+4NpwyyIiH X-Received: by 2002:a17:907:2ce4:b0:9cf:797b:6adc with SMTP id hz4-20020a1709072ce400b009cf797b6adcmr4872184ejc.33.1698516872674; Sat, 28 Oct 2023 11:14:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698516872; cv=none; d=google.com; s=arc-20160816; b=s4EtemttLsSP1E5zRfFzc0jbbbUxKFtaZc4LP8FV+iWkPPwFaKKAzlzisigoeQdMlv XbxPvJWM3Jc+qBVXh0atVYs7wWroSDy92K47Ot896Ladq/3JtdD6WjoOrr0jJk34U4Rj 9uQGeuyUg3ajs0f+2lbweZtNgN9e1nR3BU0USyifV4jYycX7yCMG9B/qgEHwjcni+APE +NS4vlSJddQstE3rDyfboxJdiGL+LPjYulQjXrYCke3PKUQpBDSFlfkYl4Sr1lK0DZu9 iR15dRvkKiESRlVoCQlNnM56mJ2dGIRoHxmDEUApcyChJI+VgqEh06fQFeAh6aqlFOa3 VWfQ== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=ZPICaDdOaX6KAHL9H+lrz0FtybvAncLRzzGRevm/GDc=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=GRSWDrAP8jklcFKyZSso/pVYr31IdvMlSef4MDOTnScWu3p0I5xAs3YheK9sjL15ln SITwmRIENsdeKmDvgFePCGIVDlI1Xg8VW0e+n49lAjFCW3Wxebq3TIjU9TYhzrhXNRZP 85YdZUO8cJtbfyovOkRsUTz/8j9cYn1a3bThhKKPrf0uU/YdYqst3EyXJK5qeGLUjI8M rvrfHxqYmZ1JZ24MoyAUsbp1VJgCiZ9MqHddJe3rM7vltEfaF0zGty8563hQJVdepl5X Gp8K7z1bDwKCiaRcsG5zOMhv6bSDy1snecS+JHyonhsLX0m1ukB3UyCrQOPVYK8DX0hQ rzqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=fVAT9fPE; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di19-20020a170906731300b00988907e3aaesi1982846ejc.428.2023.10.28.11.14.32; Sat, 28 Oct 2023 11:14:32 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=fVAT9fPE; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79C8A68CBAF; Sat, 28 Oct 2023 21:14:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C24868CA99 for ; Sat, 28 Oct 2023 21:14:19 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1698516849; bh=5KaHlFpGv9iu6gYIBlfrQYFFySHKevWY+BNTWJs3KlQ=; h=From:To:Cc:Subject:Date; b=fVAT9fPE72olQbwSQds7Y46N82LjJD/MIsjwsqGG1hcHEO/dqYuKzFpJWEPK+vSHl 4WBcbU4fAw/ELO5QPYcqrXLeYJDhalfqeLfFBh9uIYVMOUvkVQ3ruebgCSIU2OcgId 18NhtncFEVAZ3c1fC0TPMyj0LGXfV0Yzq5uyqG04= Received: from localhost.localdomain ([121.34.200.120]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 3882EC93; Sun, 29 Oct 2023 02:14:08 +0800 X-QQ-mid: xmsmtpt1698516848t30kyrysl Message-ID: X-QQ-XMAILINFO: Mg/0DM1Zd+nHVZCMOSKKPGYz9cPv8my6p4D9EKGhtVBxeCaE9YdBg/NfUPXomG +/+gspvVGAlAv/jEK0ok1FZyiiJfeiaBrsBaY1XJ/lWMSO4MzYSmdyN8UI/lzrpUCd51l8rH+jF7 dAIx4yaasRzxAB8m3vH07VfdTIiYJWE04PP7PvLIPSR7xuAt2eQBtn1nvY65mTwzkFGRQtOB/5q3 CgeD3wWaOBo9MiOYyiRDYpIueDXLLbKRFX9r0PiqV/DQv6eLWtiDF9vS82ZSk/M5P0aNcuWGQrxj nvENLcVfRzqVDcYqRsrjcZTrL6xnU5olkc2VwkPIQ8+SmZbzyhA24PQbCZCF9FdbN180QXCVVjyM gU7KdluAFp1mrcQZaq5ePhe0XsPAA/tVkK1Z2pfafRw9StfXb4ZxHiimizbwTbAdo/n+HhHNbz3y IwGG4zNvvXVky/LxGfIpoRuADoG5/fo5+PCRKLmfPmq2BI2YaIUJgAGkFX26o8X+ew9S4RL303CX slc56v3/hZ5Zv0NbTp8nSNV5q41LJysWkD+SUw4T5Ob0i3yFXrXp6ktDarMhKTNKq97yEDnQ8IaT 4dr8h1k1EDhy8AacQ7BAQDmSh054dEsI/vVPkTWfJDE7DTek/7UIH0U517WTNHC/uY+jcOnyhnLj 83j7iWPjqyhxVopprcY30r9UNP5+Hb3bRskQOS4jCbR59QTyKrZqRlgP4CbNb550yD7ZcaXVsuHu zkC5jToNUR11h649gU1g/2NBC+AeBcr3NXeFDO1Mcg6V/7wBp0NhPqAtpwn7CToqDzxUFzV5LFSi DZGroZeYOZLDMNQuyzM86YXW998B2TgmWykY4ThCvcn51cg+d2fq4UJfHqESxSuIVTv+VIXV02je QvwtOoUZjhGREQJqvqkjPdn9kZTP2KaHaosAU1tauek2svSEWdVeha0NarBNxW/AucG3BTQNfYOf 2mZmv1FHMgkmrWjfk62ueAmeM+kfPK X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Oct 2023 02:13:39 +0800 X-OQ-MSGID: <20231028181341.13090-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] fftools/ffplay: add vulkan renderer via libplacebo 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LyV4QDydrMD4 From: Zhao Zhili --- configure | 2 +- fftools/Makefile | 2 + fftools/ffplay.c | 46 ++++++- fftools/ffplay_renderer.c | 271 ++++++++++++++++++++++++++++++++++++++ fftools/ffplay_renderer.h | 38 ++++++ 5 files changed, 353 insertions(+), 6 deletions(-) create mode 100644 fftools/ffplay_renderer.c create mode 100644 fftools/ffplay_renderer.h diff --git a/configure b/configure index f494da204c..55329a5037 100755 --- a/configure +++ b/configure @@ -3903,7 +3903,7 @@ ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter ffmpeg_suggest="ole32 psapi shell32" ffplay_deps="avcodec avformat avfilter swscale swresample sdl2" ffplay_select="crop_filter transpose_filter hflip_filter vflip_filter rotate_filter" -ffplay_suggest="shell32" +ffplay_suggest="shell32 libplacebo vulkan" ffprobe_deps="avcodec avformat" ffprobe_suggest="shell32" diff --git a/fftools/Makefile b/fftools/Makefile index 56820e6bc8..3c763e3db9 100644 --- a/fftools/Makefile +++ b/fftools/Makefile @@ -22,6 +22,8 @@ OBJS-ffmpeg += \ fftools/sync_queue.o \ fftools/thread_queue.o \ +OBJS-ffplay += fftools/ffplay_renderer.o + define DOFFTOOL OBJS-$(1) += fftools/cmdutils.o fftools/opt_common.o fftools/$(1).o $(OBJS-$(1)-yes) ifdef HAVE_GNU_WINDRES diff --git a/fftools/ffplay.c b/fftools/ffplay.c index d8c69e10bc..305d72d8b8 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -58,6 +58,7 @@ #include #include "cmdutils.h" +#include "ffplay_renderer.h" #include "opt_common.h" const char program_name[] = "ffplay"; @@ -350,6 +351,7 @@ static char *afilters = NULL; static int autorotate = 1; static int find_stream_info = 1; static int filter_nbthreads = 0; +static int enable_vulkan = 0; /* current context */ static int is_full_screen; @@ -362,6 +364,8 @@ static SDL_Renderer *renderer; static SDL_RendererInfo renderer_info = {0}; static SDL_AudioDeviceID audio_dev; +static VkRenderer *vk_renderer; + static const struct TextureFormatEntry { enum AVPixelFormat format; int texture_fmt; @@ -954,6 +958,11 @@ static void video_image_display(VideoState *is) SDL_Rect rect; vp = frame_queue_peek_last(&is->pictq); + if (vk_renderer) { + vk_renderer_display(vk_renderer, vp->frame); + return; + } + if (is->subtitle_st) { if (frame_queue_nb_remaining(&is->subpq) > 0) { sp = frame_queue_peek(&is->subpq); @@ -1289,6 +1298,8 @@ static void do_exit(VideoState *is) } if (renderer) SDL_DestroyRenderer(renderer); + if (vk_renderer) + vk_renderer_destroy(vk_renderer); if (window) SDL_DestroyWindow(window); uninit_opts(); @@ -3447,6 +3458,8 @@ static void event_loop(VideoState *cur_stream) SDL_DestroyTexture(cur_stream->vis_texture); cur_stream->vis_texture = NULL; } + if (vk_renderer) + vk_renderer_resize(vk_renderer, screen_width, screen_height); case SDL_WINDOWEVENT_EXPOSED: cur_stream->force_refresh = 1; } @@ -3611,6 +3624,7 @@ static const OptionDef options[] = { { "find_stream_info", OPT_BOOL | OPT_INPUT | OPT_EXPERT, { &find_stream_info }, "read and decode the streams to fill missing information with heuristics" }, { "filter_threads", HAS_ARG | OPT_INT | OPT_EXPERT, { &filter_nbthreads }, "number of filter threads per graph" }, + { "enable_vulkan", OPT_BOOL, { &enable_vulkan }, "enable vulkan render" }, { NULL, }, }; @@ -3725,9 +3739,31 @@ int main(int argc, char **argv) #ifdef SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0"); #endif + if (enable_vulkan) { + vk_renderer = vk_get_renderer(); + if (vk_renderer) { +#if SDL_VERSION_ATLEAST(2, 0, 6) + flags |= SDL_WINDOW_VULKAN; +#endif + } else { + av_log(NULL, AV_LOG_WARNING, "Doesn't support vulkan renderer, fallback to SDL renderer\n"); + enable_vulkan = 0; + } + } window = SDL_CreateWindow(program_name, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, default_width, default_height, flags); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); - if (window) { + if (!window) { + av_log(NULL, AV_LOG_FATAL, "Failed to create window: %s", SDL_GetError()); + do_exit(NULL); + } + + if (vk_renderer) { + ret = vk_renderer_create(vk_renderer, window); + if (ret < 0) { + av_log(NULL, AV_LOG_FATAL, "Failed to create vulkan renderer, %s\n", av_err2str(ret)); + do_exit(NULL); + } + } else { renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC); if (!renderer) { av_log(NULL, AV_LOG_WARNING, "Failed to initialize a hardware accelerated renderer: %s\n", SDL_GetError()); @@ -3737,10 +3773,10 @@ int main(int argc, char **argv) if (!SDL_GetRendererInfo(renderer, &renderer_info)) av_log(NULL, AV_LOG_VERBOSE, "Initialized %s renderer.\n", renderer_info.name); } - } - if (!window || !renderer || !renderer_info.num_texture_formats) { - av_log(NULL, AV_LOG_FATAL, "Failed to create window or renderer: %s", SDL_GetError()); - do_exit(NULL); + if (!renderer || !renderer_info.num_texture_formats) { + av_log(NULL, AV_LOG_FATAL, "Failed to create window or renderer: %s", SDL_GetError()); + do_exit(NULL); + } } } diff --git a/fftools/ffplay_renderer.c b/fftools/ffplay_renderer.c new file mode 100644 index 0000000000..49e5516d5d --- /dev/null +++ b/fftools/ffplay_renderer.c @@ -0,0 +1,271 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#include "ffplay_renderer.h" + +#define HAVE_VULKAN_RENDERER (SDL_VERSION_ATLEAST(2, 0, 6) && CONFIG_LIBPLACEBO) + +#if HAVE_VULKAN_RENDERER + +#include +#include +#include +#include + +#endif + +struct VkRenderer { + const AVClass *class; + + int (*create)(VkRenderer *renderer, SDL_Window *window); + + int (*display)(VkRenderer *renderer, AVFrame *frame); + + int (*resize)(VkRenderer *renderer, int width, int height); + + void (*destroy)(VkRenderer *renderer); +}; + +#if HAVE_VULKAN_RENDERER + +typedef struct RendererContext { + VkRenderer api; + pl_vk_inst vk_inst; + pl_vulkan pl_vk; + pl_swapchain swapchain; + VkSurfaceKHR vk_surface; + pl_renderer renderer; + pl_tex tex[4]; + + pl_log vk_log; +} RendererContext; + +static void vk_log_cb(void *log_priv, enum pl_log_level level, const char *msg) { + static const int level_map[] = { + AV_LOG_QUIET, + AV_LOG_FATAL, + AV_LOG_ERROR, + AV_LOG_WARNING, + AV_LOG_INFO, + AV_LOG_DEBUG, + AV_LOG_TRACE, + }; + + if (level > 0 && level < FF_ARRAY_ELEMS(level_map)) + av_log(log_priv, level_map[level], "%s\n", msg); +} + +static int create(VkRenderer *renderer, SDL_Window *window) +{ + int ret = 0; + unsigned ext_num = 0; + const char **ext = NULL; + int w, h; + struct pl_log_params vk_log_params = { + .log_cb = vk_log_cb, + .log_level = PL_LOG_WARN, + .log_priv = renderer, + }; + RendererContext *ctx = (RendererContext *)renderer; + + if (!SDL_Vulkan_GetInstanceExtensions(window, &ext_num, NULL)) { + av_log(NULL, AV_LOG_FATAL, "Failed to get vulkan extensions: %s\n", SDL_GetError()); + return AVERROR_EXTERNAL; + } + + ext = av_calloc(ext_num, sizeof(*ext)); + if (!ext) { + ret = AVERROR(ENOMEM); + goto out; + } + + SDL_Vulkan_GetInstanceExtensions(window, &ext_num, ext); + + ctx->vk_log = pl_log_create(PL_API_VER, &vk_log_params); + ctx->vk_inst = pl_vk_inst_create(ctx->vk_log, pl_vk_inst_params( + .get_proc_addr = SDL_Vulkan_GetVkGetInstanceProcAddr(), + .debug = false, + .extensions = ext, + .num_extensions = ext_num, + )); + if (!ctx->vk_inst) { + ret = AVERROR_EXTERNAL; + goto out; + } + + if (!SDL_Vulkan_CreateSurface(window, ctx->vk_inst->instance, &ctx->vk_surface)) { + ret = AVERROR_EXTERNAL; + goto out; + } + + ctx->pl_vk = pl_vulkan_create(ctx->vk_log, pl_vulkan_params( + .instance = ctx->vk_inst->instance, + .get_proc_addr = ctx->vk_inst->get_proc_addr, + .surface = ctx->vk_surface, + .allow_software = false, + )); + if (!ctx->pl_vk) { + ret = AVERROR_EXTERNAL; + goto out; + } + + ctx->swapchain = pl_vulkan_create_swapchain(ctx->pl_vk, + pl_vulkan_swapchain_params(.surface = ctx->vk_surface, + .present_mode = VK_PRESENT_MODE_FIFO_KHR)); + + SDL_Vulkan_GetDrawableSize(window, &w, &h); + pl_swapchain_resize(ctx->swapchain, &w, &h); + + ctx->renderer = pl_renderer_create(ctx->vk_log, ctx->pl_vk->gpu); + if (!ctx->renderer) { + ret = AVERROR_EXTERNAL; + goto out; + } + ret = 0; + +out: + av_free(ext); + return ret; +} + +static int display(VkRenderer *renderer, AVFrame *frame) +{ + struct pl_swapchain_frame swap_frame = {0}; + struct pl_frame pl_frame = {0}; + struct pl_frame target = {0}; + RendererContext *ctx = (RendererContext *)renderer; + int ret = 0; + + if (!pl_map_avframe_ex(ctx->pl_vk->gpu, &pl_frame, pl_avframe_params( + .frame = frame, + .tex = ctx->tex))) { + av_log(NULL, AV_LOG_ERROR, "pl_map_avframe_ex failed\n"); + return AVERROR_EXTERNAL; + } + + if (!pl_swapchain_start_frame(ctx->swapchain, &swap_frame)) { + av_log(NULL, AV_LOG_ERROR, "start frame failed\n"); + ret = AVERROR_EXTERNAL; + goto out; + } + + pl_frame_from_swapchain(&target, &swap_frame); + if (!pl_render_image(ctx->renderer, &pl_frame, &target, &pl_render_default_params)) { + av_log(NULL, AV_LOG_ERROR, "pl_render_image failed\n"); + ret = AVERROR_EXTERNAL; + goto out; + } + + if (!pl_swapchain_submit_frame(ctx->swapchain)) { + av_log(NULL, AV_LOG_ERROR, "pl_swapchain_submit_frame failed\n"); + ret = AVERROR_EXTERNAL; + goto out; + } + pl_swapchain_swap_buffers(ctx->swapchain); + +out: + pl_unmap_avframe(ctx->pl_vk->gpu, &pl_frame); + return ret; +} + +static int resize(VkRenderer *renderer, int width, int height) +{ + RendererContext *ctx = (RendererContext *)renderer; + + if (!pl_swapchain_resize(ctx->swapchain, &width, &height)) + return AVERROR_EXTERNAL; + return 0; +} + +static void destroy(VkRenderer *renderer) +{ + PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR; + RendererContext *ctx = (RendererContext *)renderer; + + if (ctx->pl_vk) { + for (int i = 0; i < FF_ARRAY_ELEMS(ctx->tex); i++) + pl_tex_destroy(ctx->pl_vk->gpu, &ctx->tex[i]); + pl_renderer_destroy(&ctx->renderer); + pl_swapchain_destroy(&ctx->swapchain); + pl_vulkan_destroy(&ctx->pl_vk); + } + + if (ctx->vk_surface) { + vkDestroySurfaceKHR = (PFN_vkDestroySurfaceKHR) + ctx->vk_inst->get_proc_addr(ctx->vk_inst->instance, "vkDestroySurfaceKHR"); + vkDestroySurfaceKHR(ctx->vk_inst->instance, ctx->vk_surface, NULL); + ctx->vk_surface = NULL; + } + + pl_vk_inst_destroy(&ctx->vk_inst); + pl_log_destroy(&ctx->vk_log); +} + +static const AVClass vulkan_renderer_class = { + .class_name = "Vulkan Renderer", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, +}; + +VkRenderer *vk_get_renderer(void) +{ + RendererContext *ctx = av_mallocz(sizeof(*ctx)); + VkRenderer *renderer; + + if (!ctx) + return NULL; + + renderer = &ctx->api; + renderer->class = &vulkan_renderer_class; + renderer->create = create; + renderer->display = display; + renderer->resize = resize; + renderer->destroy = destroy; + + return renderer; +} + +#else + +VkRenderer *vk_get_renderer(void) +{ + return NULL; +} + +#endif + +int vk_renderer_create(VkRenderer *renderer, SDL_Window *window) +{ + return renderer->create(renderer, window); +} + +int vk_renderer_display(VkRenderer *renderer, AVFrame *frame) +{ + return renderer->display(renderer, frame); +} + +int vk_renderer_resize(VkRenderer *renderer, int width, int height) +{ + return renderer->resize(renderer, width, height); +} + +void vk_renderer_destroy(VkRenderer *renderer) +{ + renderer->destroy(renderer); +} diff --git a/fftools/ffplay_renderer.h b/fftools/ffplay_renderer.h new file mode 100644 index 0000000000..4029f154a9 --- /dev/null +++ b/fftools/ffplay_renderer.h @@ -0,0 +1,38 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef FFTOOLS_FFPLAY_RENDERER_H +#define FFTOOLS_FFPLAY_RENDERER_H + +#include + +#include "libavutil/frame.h" + +typedef struct VkRenderer VkRenderer; + +VkRenderer *vk_get_renderer(void); + +int vk_renderer_create(VkRenderer *renderer, SDL_Window *window); + +int vk_renderer_display(VkRenderer *renderer, AVFrame *frame); + +int vk_renderer_resize(VkRenderer *renderer, int width, int height); + +void vk_renderer_destroy(VkRenderer *renderer); + +#endif /* FFTOOLS_FFPLAY_RENDERER_H */ From patchwork Sat Oct 28 18:13:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44416 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp587022pzb; Sat, 28 Oct 2023 11:14:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFALIbIlSD9rBYuQLhNyAskAzaITIra7FWt9gJ5zG8DdtVxCrS3WrtmETJERaawfmnfaKyj X-Received: by 2002:a17:907:2d27:b0:9a2:295a:9bbc with SMTP id gs39-20020a1709072d2700b009a2295a9bbcmr5002458ejc.37.1698516883141; Sat, 28 Oct 2023 11:14:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698516883; cv=none; d=google.com; s=arc-20160816; b=gtTJGGe9VjUnkxp9fjFk8mGRY6Xs1uQNwQdL6qGIjLoHVdWzy0HAq2RAvU805NaxbS 67sddKcfR2mXwhm26i9+al9w1xnn6rMI4Q9py6oZ3nty03GJM5qKGG0gbqtyqmSDBkl+ RNmL7NNFOYEkK+iCZoczhz1eMeKJ00pI78UD3J9XJcI0hMasOh669F1jGfVPspC7QGOe pA/RPhiQodL7CZT92S8tbte1I1Kead3gCWw3fE4NnqQIoscVrvrDDDPgCjWEvXCkhwd2 ogRYY/wW1a/4DpRQK5vm2lctQEY5Hj+0HUJXz5DhkZC8QunkMYd0ZP9RWe5FUFaPeKbF k8fg== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=InNu9giiG/p46HU8WyGzm1oPnEkq/BaotSZay2Eq9CI=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=po87aDub53AwXTFWq2zuKfxDgZuDQ3IVPUSOwViPrlozg1T+6lBdXURpRyNUF66Z2L nLPDbwb3GRCqSuv/NVPfhJWHfNoOxb4DkFLqwQfaDQTTZ1TlzBuiqlnr1t5VHiu0bdl0 7Cr8fKdLDHnhoJW0HDbgDj2jiZF2O+b39pcqJJF434pUuiFjPBx+pIJS5HXmeSKEKNmW dahgdWrJc7Tump3T1OILtGWX+LD/xm51IWRVXnDgT9MCz4ReEeUMAyB+Japp0fOA+Rcp hNF9YDXxkGJYvxJP65K2WSf8a9UONNagkBkWOQqGpM0yHpye0ZDZWKw/fLJ2oR5XCqF6 JiLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=HNddko88; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 28-20020a17090600dc00b0099bc62f3629si1743162eji.567.2023.10.28.11.14.42; Sat, 28 Oct 2023 11:14:43 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=HNddko88; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D4B268CB32; Sat, 28 Oct 2023 21:14:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 699D668CA46 for ; Sat, 28 Oct 2023 21:14:19 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1698516850; bh=KMbvzHz617drJd4bqjrmMPmYiNk6BZ4AzoY/9QzKbYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HNddko88txIqytIjK0Z8FlVdPAfJWr/YEBwFwTHWNnxxSxRJrU+zNUtC3yXR3/QCe oD0pErcTVXCYAVzC9bJKkntMJnzEIitWPkYBE707ZRb/Ax4Kx4G60FsYgSlldH682J jDCqs8MwoHOuhoicO7Of0G4w3zEqqjjXeJ649rjc= Received: from localhost.localdomain ([121.34.200.120]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 3882EC93; Sun, 29 Oct 2023 02:14:08 +0800 X-QQ-mid: xmsmtpt1698516849tz048mln7 Message-ID: X-QQ-XMAILINFO: NhpLzBn2I3XwjYFGrbg1waKazAUaxRMoDidT3oXniu1e860Nnba+RKgz35ww0o TxmMoXqpvy8Se3XxptwU3bZs4NS6GyjAZacwOWIKtutp36x/SpwBo9AvbELQ/GCc9jXV//ODHYCa 1F+CUPF0++rTxPEgTpdih8HlAe2pbN0R28MecA+zFWeV7AAXFTvVzN3e7yhTgAr5BAXFGNPV5Fjz Cbf6v50DNd5ifZ6k7Jqez4w1F8MKngLVW3GBrMBJce/t8UjM8rfolnbMR8ChhYufyfWUESq82ilq +792Cy+OD2p+SoCh2WqVf7Vz0bvpes2LzFGpjoEptH6Y642yma6oMBRQehGTP68bPzgIbdMr6pbv 9r5y4deh5LEZHQdv/zj5QpH3G1em7Sg5CaB3jOrtGuydnDUH8kuUHwV9qiRJxdFOpiOdotqW7Vl6 OD+a9JzanCKtnwCN4xSgnrSZejh5Czeks2Ws3jI0MDdTP8NMgePoMLcAD3sXLsIoTEaYQn07USnw B5B7kqVBFNwh5TDRbkt0xcYgoaCUQZoer+LEL7CVJiNrVs0rpK6f1wEuNb2jFQMBpu2jPcSZ/rAB 07nxBVeci5vIAdv2eiBTY/hPE6zjmxANJ35Rf5C0H9UzhaxsLenoCU+3oh9L2sPLfwxSUZp+fb6l 6yrtrq1C3NvFjZS0yh84FS+gOE5b8nKtK4kvt6GFlT/vKEgVMQiIbSKU4XdXYuOKbWxD/I9MyZLa 6HuNIWsonhGvhzIgclRKUO6R2NNWfIpOKdbpq/wLzRqUCn6q17diTpkUluv/qM/paIfHeTc0ngXE 37ray1HRHUTXjXm4RjDmeqb9Hw8Vzbud8oaC72ykx8iH3a7PraKj8RSxwi4uBKOlLGM69iZtaQsA 1NAmVpHC0j1b4AwuKx/sYw7chYjvrFidl1NgbnX1JGOb0ZQIqwxvhcpwGs4XIunq1FheYGz3291E WPB7ZRWh+m1Js19oboVLPXawmXA4S8DF5NaBGTwus= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Oct 2023 02:13:40 +0800 X-OQ-MSGID: <20231028181341.13090-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231028181341.13090-1-quinkblack@foxmail.com> References: <20231028181341.13090-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] fftools/ffplay: add hwaccel decoding support 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M9+MmNi2xM2Z From: Zhao Zhili --- v3: shared vulkan instance between libplacebo and hwcontext fftools/ffplay.c | 43 ++++++ fftools/ffplay_renderer.c | 316 +++++++++++++++++++++++++++++++++++++- fftools/ffplay_renderer.h | 2 + 3 files changed, 355 insertions(+), 6 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 305d72d8b8..29b37a5e46 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -352,6 +352,7 @@ static int autorotate = 1; static int find_stream_info = 1; static int filter_nbthreads = 0; static int enable_vulkan = 0; +static const char *hwaccel = NULL; /* current context */ static int is_full_screen; @@ -2557,6 +2558,37 @@ static int audio_open(void *opaque, AVChannelLayout *wanted_channel_layout, int return spec.size; } +static int create_hwaccel(AVBufferRef **device_ctx) +{ + enum AVHWDeviceType type; + int ret; + AVBufferRef *vk_dev; + + *device_ctx = NULL; + + if (!hwaccel) + return 0; + + type = av_hwdevice_find_type_by_name(hwaccel); + if (type == AV_HWDEVICE_TYPE_NONE) + return AVERROR(ENOTSUP); + + ret = vk_renderer_get_hw_dev(vk_renderer, &vk_dev); + if (ret < 0) + return ret; + + ret = av_hwdevice_ctx_create_derived(device_ctx, type, vk_dev, 0); + if (!ret) + return 0; + + if (ret != AVERROR(ENOSYS)) + return ret; + + av_log(NULL, AV_LOG_WARNING, "Derive %s from vulkan not supported.\n", hwaccel); + ret = av_hwdevice_ctx_create(device_ctx, type, NULL, NULL, 0); + return ret; +} + /* open a given stream. Return 0 if OK */ static int stream_component_open(VideoState *is, int stream_index) { @@ -2624,6 +2656,12 @@ static int stream_component_open(VideoState *is, int stream_index) av_dict_set(&opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + ret = create_hwaccel(&avctx->hw_device_ctx); + if (ret < 0) + goto fail; + } + if ((ret = avcodec_open2(avctx, codec, &opts)) < 0) { goto fail; } @@ -3625,6 +3663,7 @@ static const OptionDef options[] = { "read and decode the streams to fill missing information with heuristics" }, { "filter_threads", HAS_ARG | OPT_INT | OPT_EXPERT, { &filter_nbthreads }, "number of filter threads per graph" }, { "enable_vulkan", OPT_BOOL, { &enable_vulkan }, "enable vulkan render" }, + { "hwaccel", HAS_ARG | OPT_STRING | OPT_EXPERT, { &hwaccel }, "use HW accelerated decoding" }, { NULL, }, }; @@ -3739,6 +3778,10 @@ int main(int argc, char **argv) #ifdef SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0"); #endif + if (hwaccel && !enable_vulkan) { + av_log(NULL, AV_LOG_INFO, "Enable vulkan renderer to support hwaccel %s\n", hwaccel); + enable_vulkan = 1; + } if (enable_vulkan) { vk_renderer = vk_get_renderer(); if (vk_renderer) { diff --git a/fftools/ffplay_renderer.c b/fftools/ffplay_renderer.c index 49e5516d5d..497d758ec7 100644 --- a/fftools/ffplay_renderer.c +++ b/fftools/ffplay_renderer.c @@ -35,6 +35,8 @@ struct VkRenderer { int (*create)(VkRenderer *renderer, SDL_Window *window); + int (*get_hw_dev)(VkRenderer *renderer, AVBufferRef **dev); + int (*display)(VkRenderer *renderer, AVFrame *frame); int (*resize)(VkRenderer *renderer, int width, int height); @@ -54,6 +56,13 @@ typedef struct RendererContext { pl_tex tex[4]; pl_log vk_log; + + AVBufferRef *hw_device_ref; + AVBufferRef *hw_frame_ref; + enum AVPixelFormat *transfer_formats; + AVHWFramesConstraints *constraints; + + AVFrame *vk_frame; } RendererContext; static void vk_log_cb(void *log_priv, enum pl_log_level level, const char *msg) { @@ -74,35 +83,46 @@ static void vk_log_cb(void *log_priv, enum pl_log_level level, const char *msg) static int create(VkRenderer *renderer, SDL_Window *window) { int ret = 0; - unsigned ext_num = 0; + unsigned num_ext = 0; const char **ext = NULL; int w, h; struct pl_log_params vk_log_params = { .log_cb = vk_log_cb, - .log_level = PL_LOG_WARN, + .log_level = PL_LOG_DEBUG, .log_priv = renderer, }; RendererContext *ctx = (RendererContext *)renderer; - if (!SDL_Vulkan_GetInstanceExtensions(window, &ext_num, NULL)) { + static const char *opt_exts[] = { + VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME, + VK_EXT_SHADER_ATOMIC_FLOAT_EXTENSION_NAME, + VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, + VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME, + VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME, + VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, + "VK_MESA_video_decode_av1", + }; + const int num_opt_exts = FF_ARRAY_ELEMS(opt_exts); + + if (!SDL_Vulkan_GetInstanceExtensions(window, &num_ext, NULL)) { av_log(NULL, AV_LOG_FATAL, "Failed to get vulkan extensions: %s\n", SDL_GetError()); return AVERROR_EXTERNAL; } - ext = av_calloc(ext_num, sizeof(*ext)); + ext = av_calloc(num_ext, sizeof(*ext)); if (!ext) { ret = AVERROR(ENOMEM); goto out; } - SDL_Vulkan_GetInstanceExtensions(window, &ext_num, ext); + SDL_Vulkan_GetInstanceExtensions(window, &num_ext, ext); ctx->vk_log = pl_log_create(PL_API_VER, &vk_log_params); ctx->vk_inst = pl_vk_inst_create(ctx->vk_log, pl_vk_inst_params( .get_proc_addr = SDL_Vulkan_GetVkGetInstanceProcAddr(), .debug = false, .extensions = ext, - .num_extensions = ext_num, + .num_extensions = num_ext )); if (!ctx->vk_inst) { ret = AVERROR_EXTERNAL; @@ -119,6 +139,9 @@ static int create(VkRenderer *renderer, SDL_Window *window) .get_proc_addr = ctx->vk_inst->get_proc_addr, .surface = ctx->vk_surface, .allow_software = false, + .opt_extensions = opt_exts, + .num_opt_extensions = num_opt_exts, + .extra_queues = VK_QUEUE_VIDEO_DECODE_BIT_KHR, )); if (!ctx->pl_vk) { ret = AVERROR_EXTERNAL; @@ -137,6 +160,13 @@ static int create(VkRenderer *renderer, SDL_Window *window) ret = AVERROR_EXTERNAL; goto out; } + + ctx->vk_frame = av_frame_alloc(); + if (!ctx->vk_frame) { + ret = AVERROR(ENOMEM); + goto out; + } + ret = 0; out: @@ -144,6 +174,264 @@ out: return ret; } +static void lock_queue(struct AVHWDeviceContext *dev_ctx, uint32_t queue_family, uint32_t index) +{ + RendererContext *ctx = dev_ctx->user_opaque; + pl_vulkan vk = ctx->pl_vk; + vk->lock_queue(vk, queue_family, index); +} + +static void unlock_queue(struct AVHWDeviceContext *dev_ctx, uint32_t queue_family, uint32_t index) +{ + RendererContext *ctx = dev_ctx->user_opaque; + pl_vulkan vk = ctx->pl_vk; + vk->unlock_queue(vk, queue_family, index); +} + +static int get_decode_queue(VkRenderer *renderer, int *index, int *count) +{ + RendererContext *ctx = (RendererContext *) renderer; + VkQueueFamilyProperties *queue_family_prop = NULL; + uint32_t num_queue_family_prop = 0; + PFN_vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceQueueFamilyProperties; + + *index = -1; + *count = 0; + vkGetPhysicalDeviceQueueFamilyProperties = (PFN_vkGetPhysicalDeviceQueueFamilyProperties) + ctx->vk_inst->get_proc_addr(ctx->vk_inst->instance, + "vkGetPhysicalDeviceQueueFamilyProperties"); + vkGetPhysicalDeviceQueueFamilyProperties(ctx->pl_vk->phys_device, &num_queue_family_prop, NULL); + if (!num_queue_family_prop) + return AVERROR_EXTERNAL; + + queue_family_prop = av_calloc(num_queue_family_prop, sizeof(*queue_family_prop)); + if (!queue_family_prop) + return AVERROR(ENOMEM); + + vkGetPhysicalDeviceQueueFamilyProperties(ctx->pl_vk->phys_device, &num_queue_family_prop, queue_family_prop); + + for (int i = 0; i < num_queue_family_prop; i++) { + if (queue_family_prop[i].queueFlags & VK_QUEUE_VIDEO_DECODE_BIT_KHR) { + *index = i; + *count = queue_family_prop[i].queueCount; + break; + } + } + av_free(queue_family_prop); + + return 0; +} + +static int get_hw_dev(VkRenderer *renderer, AVBufferRef **dev) +{ + RendererContext *ctx = (RendererContext *)renderer; + AVHWDeviceContext *device_ctx; + AVVulkanDeviceContext *vk_dev_ctx; + int decode_index; + int decode_count; + int ret; + + *dev = NULL; + if (ctx->hw_device_ref) { + *dev = ctx->hw_device_ref; + return 0; + } + + ctx->hw_device_ref = av_hwdevice_ctx_alloc(AV_HWDEVICE_TYPE_VULKAN); + if (!ctx->hw_device_ref) { + return AVERROR(ENOMEM); + } + + device_ctx = (AVHWDeviceContext *)ctx->hw_device_ref->data; + device_ctx->user_opaque = ctx; + + vk_dev_ctx = device_ctx->hwctx; + vk_dev_ctx->lock_queue = lock_queue, + vk_dev_ctx->unlock_queue = unlock_queue; + + vk_dev_ctx->get_proc_addr = ctx->vk_inst->get_proc_addr; + + vk_dev_ctx->inst = ctx->vk_inst->instance; + vk_dev_ctx->phys_dev = ctx->pl_vk->phys_device; + vk_dev_ctx->act_dev = ctx->pl_vk->device; + + vk_dev_ctx->device_features = *ctx->pl_vk->features; + + vk_dev_ctx->enabled_inst_extensions = ctx->vk_inst->extensions; + vk_dev_ctx->nb_enabled_inst_extensions = ctx->vk_inst->num_extensions; + + vk_dev_ctx->enabled_dev_extensions = ctx->pl_vk->extensions; + vk_dev_ctx->nb_enabled_dev_extensions = ctx->pl_vk->num_extensions; + + vk_dev_ctx->queue_family_index = ctx->pl_vk->queue_graphics.index; + vk_dev_ctx->nb_graphics_queues = ctx->pl_vk->queue_graphics.count; + + vk_dev_ctx->queue_family_tx_index = ctx->pl_vk->queue_transfer.index; + vk_dev_ctx->nb_tx_queues = ctx->pl_vk->queue_transfer.count; + + vk_dev_ctx->queue_family_comp_index = ctx->pl_vk->queue_compute.index; + vk_dev_ctx->nb_comp_queues = ctx->pl_vk->queue_compute.count; + + ret = get_decode_queue(renderer, &decode_index, &decode_count); + if (ret < 0) + return ret; + + vk_dev_ctx->queue_family_decode_index = decode_index; + vk_dev_ctx->nb_decode_queues = decode_count; + + ret = av_hwdevice_ctx_init(ctx->hw_device_ref); + if (ret < 0) + return ret; + + *dev = ctx->hw_device_ref; + return 0; +} + +static int create_hw_frame(VkRenderer *renderer, AVFrame *frame) +{ + RendererContext *ctx = (RendererContext *)renderer; + AVHWFramesContext *src_hw_frame = (AVHWFramesContext *)frame->hw_frames_ctx->data; + AVHWFramesContext *hw_frame; + AVVulkanFramesContext *vk_frame_ctx; + int ret; + + if (ctx->hw_frame_ref) { + hw_frame = (AVHWFramesContext *)ctx->hw_frame_ref->data; + + if (hw_frame->width == frame->width && + hw_frame->height == frame->height && + hw_frame->sw_format == src_hw_frame->sw_format) + return 0; + + av_buffer_unref(&ctx->hw_frame_ref); + } + + if (!ctx->constraints) { + ctx->constraints = av_hwdevice_get_hwframe_constraints(ctx->hw_device_ref, NULL); + if (!ctx->constraints) + return AVERROR(ENOMEM); + } + + // Check constraints and skip create hwframe. + // Don't take it as error since we can fallback to memory copy from GPU to CPU. + if ((ctx->constraints->max_width && ctx->constraints->max_width < frame->width) || + (ctx->constraints->max_height && ctx->constraints->max_height < frame->height) || + (ctx->constraints->min_width && ctx->constraints->min_width > frame->width) || + (ctx->constraints->min_height && ctx->constraints->min_height > frame->height)) + return 0; + + if (ctx->constraints->valid_sw_formats) { + enum AVPixelFormat *sw_formats = ctx->constraints->valid_sw_formats; + while (*sw_formats != AV_PIX_FMT_NONE) { + if (*sw_formats == src_hw_frame->sw_format) + break; + sw_formats++; + } + if (*sw_formats == AV_PIX_FMT_NONE) + return 0; + } + + ctx->hw_frame_ref = av_hwframe_ctx_alloc(ctx->hw_device_ref); + if (!ctx->hw_frame_ref) + return AVERROR(ENOMEM); + + hw_frame = (AVHWFramesContext *)ctx->hw_frame_ref->data; + hw_frame->format = AV_PIX_FMT_VULKAN; + hw_frame->sw_format = src_hw_frame->sw_format; + hw_frame->width = frame->width; + hw_frame->height = frame->height; + + if (frame->format == AV_PIX_FMT_CUDA) { + vk_frame_ctx = hw_frame->hwctx; + vk_frame_ctx->flags = AV_VK_FRAME_FLAG_DISABLE_MULTIPLANE; + } + + ret = av_hwframe_ctx_init(ctx->hw_frame_ref); + if (ret < 0) { + av_log(renderer, AV_LOG_ERROR, "Create hwframe context failed, %s\n", av_err2str(ret)); + return ret; + } + + av_hwframe_transfer_get_formats(ctx->hw_frame_ref, AV_HWFRAME_TRANSFER_DIRECTION_TO, + &ctx->transfer_formats, 0); + + return 0; +} + +static inline int check_hw_transfer(RendererContext *ctx, AVFrame *frame) +{ + if (!ctx->hw_frame_ref || !ctx->transfer_formats) + return 0; + + for (int i = 0; ctx->transfer_formats[i] != AV_PIX_FMT_NONE; i++) + if (ctx->transfer_formats[i] == frame->format) + return 1; + + return 0; +} + +static int transfer_frame(VkRenderer *renderer, AVFrame *frame) +{ + RendererContext *ctx = (RendererContext *)renderer; + int ret; + + if (!frame->hw_frames_ctx) + return 0; + + if (frame->format == AV_PIX_FMT_VULKAN) + return 0; + + ret = create_hw_frame(renderer, frame); + if (ret < 0) + return ret; + + // Try map data first + av_frame_unref(ctx->vk_frame); + if (ctx->hw_frame_ref) { + ctx->vk_frame->hw_frames_ctx = av_buffer_ref(ctx->hw_frame_ref); + ctx->vk_frame->format = AV_PIX_FMT_VULKAN; + } + ret = av_hwframe_map(ctx->vk_frame, frame, AV_HWFRAME_MAP_READ); + if (!ret) + goto out; + + if (ret != AVERROR(ENOSYS)) { + av_log(NULL, AV_LOG_FATAL, "Map data to vulkan failed: %s\n", av_err2str(ret)); + return ret; + } + + // Try transfer to vulkan + if (check_hw_transfer(ctx, frame)) { + av_frame_unref(ctx->vk_frame); + av_hwframe_get_buffer(ctx->hw_frame_ref, ctx->vk_frame, 0); + ret = av_hwframe_transfer_data(ctx->vk_frame, frame, 1); + if (!ret) + goto out; + + if (ret < 0 && ret != AVERROR(ENOSYS)) { + av_log(NULL, AV_LOG_FATAL, "Transfer data to vulkan failed: %s\n", av_err2str(ret)); + return ret; + } + } + + // Transfer to CPU + av_frame_unref(ctx->vk_frame); + ret = av_hwframe_transfer_data(ctx->vk_frame, frame, 0); + if (ret < 0) { + av_log(NULL, AV_LOG_FATAL, "Transfer data to CPU failed: %s\n", av_err2str(ret)); + return ret; + } + +out: + ret = av_frame_copy_props(ctx->vk_frame, frame); + if (ret < 0) + return ret; + av_frame_unref(frame); + av_frame_move_ref(frame, ctx->vk_frame); + + return 0; +} + static int display(VkRenderer *renderer, AVFrame *frame) { struct pl_swapchain_frame swap_frame = {0}; @@ -152,6 +440,10 @@ static int display(VkRenderer *renderer, AVFrame *frame) RendererContext *ctx = (RendererContext *)renderer; int ret = 0; + ret = transfer_frame(renderer, frame); + if (ret < 0) + return ret; + if (!pl_map_avframe_ex(ctx->pl_vk->gpu, &pl_frame, pl_avframe_params( .frame = frame, .tex = ctx->tex))) { @@ -198,6 +490,12 @@ static void destroy(VkRenderer *renderer) PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR; RendererContext *ctx = (RendererContext *)renderer; + av_freep(&ctx->transfer_formats); + av_hwframe_constraints_free(&ctx->constraints); + av_buffer_unref(&ctx->hw_frame_ref); + av_buffer_unref(&ctx->hw_device_ref); + av_frame_free(&ctx->vk_frame); + if (ctx->pl_vk) { for (int i = 0; i < FF_ARRAY_ELEMS(ctx->tex); i++) pl_tex_destroy(ctx->pl_vk->gpu, &ctx->tex[i]); @@ -233,6 +531,7 @@ VkRenderer *vk_get_renderer(void) renderer = &ctx->api; renderer->class = &vulkan_renderer_class; + renderer->get_hw_dev = get_hw_dev; renderer->create = create; renderer->display = display; renderer->resize = resize; @@ -255,6 +554,11 @@ int vk_renderer_create(VkRenderer *renderer, SDL_Window *window) return renderer->create(renderer, window); } +int vk_renderer_get_hw_dev(VkRenderer *renderer, AVBufferRef **dev) +{ + return renderer->get_hw_dev(renderer, dev); +} + int vk_renderer_display(VkRenderer *renderer, AVFrame *frame) { return renderer->display(renderer, frame); diff --git a/fftools/ffplay_renderer.h b/fftools/ffplay_renderer.h index 4029f154a9..b982ba0192 100644 --- a/fftools/ffplay_renderer.h +++ b/fftools/ffplay_renderer.h @@ -29,6 +29,8 @@ VkRenderer *vk_get_renderer(void); int vk_renderer_create(VkRenderer *renderer, SDL_Window *window); +int vk_renderer_get_hw_dev(VkRenderer *renderer, AVBufferRef **dev); + int vk_renderer_display(VkRenderer *renderer, AVFrame *frame); int vk_renderer_resize(VkRenderer *renderer, int width, int height);