From patchwork Thu May 11 08:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 41576 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp4432876pzb; Thu, 11 May 2023 01:29:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4fShDKYZ+Pn4ezZQsDSZ+LGLDA2HrOZxIOxjLKAkvFdo0cqjs8FYwPU5dbuNo85Agw1bFA X-Received: by 2002:a17:907:6eaa:b0:94f:81c:725e with SMTP id sh42-20020a1709076eaa00b0094f081c725emr22298214ejc.59.1683793746897; Thu, 11 May 2023 01:29:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683793746; cv=none; d=google.com; s=arc-20160816; b=P95aYILQak0e0kk+oMdx6Dy1huHefS6RIdJg8YVE6wsDL21bK+KMGzyFHOewd23Z3/ VmgKsWEImWYG56rZNzPZGIHD2JbN74paq3qduyHP007FZs9mlJfsPkUz8WlP6KwlFZdG PaXh6GqFRLe7tUK204l1JQHdKaOwpw9FmFtfSNi8J/QNygrfR901k/OcYpQHzRLbHtYi du5It3opXGXoYu6hoXk7y2FuIFhXYHSHUa2izSfuIanzaRf1Wo4B9ApnzTIfHx9s5gSW xfViViVk+gesp1I7+jQogkqIdacPcRsrnCH8h4+nDUK1t/4Yd2V6kNMtWvGMrUWZxZ7u q8+Q== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=2ozPju2FQSKvgzgLDsdq50Izq2QtvcY25uMZDKyEM5I=; b=B4KNR2LwIhIZi2FylyuM8SK79qtth1f6x/6uwjKDpDznh6GF51LFcsGcL4FPbCYCFj OOLlw7oPahPz5Bg9LUOqeJBtY9cMswnmH2n5ZzoiV3wI0R7zkXIGuAJnbzAl+84BSlzM fN5B08JseimHkfW0SVAndUKp8YTr8O7Snvlgr86d+t6Izu1wACW/UgdXjfv/eu99yJmF jwEbGgFxTCiq7ezph73npdlgwAozIRLYN7wNKe38oL827MlP78BJ3VpNEHKm4gVhpzUk dxFCv8h+/ixp5PBM00VvSikUV+XWVijBfPnkb7MxxKnkLUKcgQFijL41q29BIls3AOX4 iZXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=bXhFrKKL; 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 c20-20020aa7df14000000b0050489449e77si4423786edy.569.2023.05.11.01.29.06; Thu, 11 May 2023 01:29:06 -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=@haasn.xyz header.s=mail header.b=bXhFrKKL; 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 0C95268C112; Thu, 11 May 2023 11:29:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4EE468C078 for ; Thu, 11 May 2023 11:28:54 +0300 (EEST) Received: from localhost (217-74-0-168.hsi.r-kom.net [217.74.0.168]) by haasn.dev (Postfix) with ESMTPSA id 875FC40E98; Thu, 11 May 2023 10:28:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1683793734; bh=6eOosLK1a/F+oAskSjMbirc41nDLRSXf0CtBT3oZS3w=; h=From:To:Cc:Subject:Date:From; b=bXhFrKKLgxCRO+Rd8xDvX4mG6PqVJEaOXzBuDKs9cAdx0eC1/GJeNaYPw9X0eCWdG 4Idl2JKLyvjk0uGo4E03obqK1M707FH9N1D9zx/hOUtffXLJyBYnW25IyBWW6zeBOH maDdHI4xBfhl1Cjtxt8drle4sgq1DREExEYuyE3A= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 May 2023 10:28:50 +0200 Message-Id: <20230511082850.5289-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_libplacebo: add vulkan device import fallback 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CBpDwahs5Gdm From: Niklas Haas Fixes: https://github.com/haasn/libplacebo/issues/170 Fixes: https://github.com/mpv-player/mpv/issues/9589#issuecomment-1535432185 Fixes: https://code.videolan.org/videolan/libplacebo/-/issues/270 --- libavfilter/vf_libplacebo.c | 91 +++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 6fe3e0ea88..aa5c33ddfe 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -351,58 +351,50 @@ fail: return err; } -static int init_vulkan(AVFilterContext *avctx) +static int init_vulkan(AVFilterContext *avctx, const AVVulkanDeviceContext *hwctx) { int err = 0; LibplaceboContext *s = avctx->priv; - const AVHWDeviceContext *avhwctx; - const AVVulkanDeviceContext *hwctx; uint8_t *buf = NULL; size_t buf_len; - if (!avctx->hw_device_ctx) { - av_log(s, AV_LOG_ERROR, "Missing vulkan hwdevice for vf_libplacebo.\n"); - return AVERROR(EINVAL); - } - - avhwctx = (AVHWDeviceContext *) avctx->hw_device_ctx->data; - if (avhwctx->type != AV_HWDEVICE_TYPE_VULKAN) { - av_log(s, AV_LOG_ERROR, "Expected vulkan hwdevice for vf_libplacebo, got %s.\n", - av_hwdevice_get_type_name(avhwctx->type)); - return AVERROR(EINVAL); + if (hwctx) { + /* Import libavfilter vulkan context into libplacebo */ + s->vulkan = pl_vulkan_import(s->log, pl_vulkan_import_params( + .instance = hwctx->inst, + .get_proc_addr = hwctx->get_proc_addr, + .phys_device = hwctx->phys_dev, + .device = hwctx->act_dev, + .extensions = hwctx->enabled_dev_extensions, + .num_extensions = hwctx->nb_enabled_dev_extensions, + .features = &hwctx->device_features, + .queue_graphics = { + .index = hwctx->queue_family_index, + .count = hwctx->nb_graphics_queues, + }, + .queue_compute = { + .index = hwctx->queue_family_comp_index, + .count = hwctx->nb_comp_queues, + }, + .queue_transfer = { + .index = hwctx->queue_family_tx_index, + .count = hwctx->nb_tx_queues, + }, + /* This is the highest version created by hwcontext_vulkan.c */ + .max_api_version = VK_API_VERSION_1_2, + )); } - hwctx = avhwctx->hwctx; - - /* Import libavfilter vulkan context into libplacebo */ - s->vulkan = pl_vulkan_import(s->log, pl_vulkan_import_params( - .instance = hwctx->inst, - .get_proc_addr = hwctx->get_proc_addr, - .phys_device = hwctx->phys_dev, - .device = hwctx->act_dev, - .extensions = hwctx->enabled_dev_extensions, - .num_extensions = hwctx->nb_enabled_dev_extensions, - .features = &hwctx->device_features, - .queue_graphics = { - .index = hwctx->queue_family_index, - .count = hwctx->nb_graphics_queues, - }, - .queue_compute = { - .index = hwctx->queue_family_comp_index, - .count = hwctx->nb_comp_queues, - }, - .queue_transfer = { - .index = hwctx->queue_family_tx_index, - .count = hwctx->nb_tx_queues, - }, - /* This is the highest version created by hwcontext_vulkan.c */ - .max_api_version = VK_API_VERSION_1_2, - )); - if (!s->vulkan) { - av_log(s, AV_LOG_ERROR, "Failed importing vulkan device to libplacebo!\n"); - err = AVERROR_EXTERNAL; - goto fail; + s->vulkan = pl_vulkan_create(s->log, pl_vulkan_params( + .get_proc_addr = hwctx ? hwctx->get_proc_addr : NULL, + .queue_count = 0, /* enable all queues for parallelization */ + )); + if (!s->vulkan) { + av_log(s, AV_LOG_ERROR, "Failed creating fallback vulkan device!\n"); + err = AVERROR_EXTERNAL; + goto fail; + } } /* Create the renderer */ @@ -695,10 +687,17 @@ static int libplacebo_query_format(AVFilterContext *ctx) { int err; LibplaceboContext *s = ctx->priv; + const AVVulkanDeviceContext *vkhwctx = NULL; const AVPixFmtDescriptor *desc = NULL; AVFilterFormats *infmts = NULL, *outfmts = NULL; - RET(init_vulkan(ctx)); + if (ctx->hw_device_ctx) { + const AVHWDeviceContext *avhwctx = (void *) ctx->hw_device_ctx->data; + if (avhwctx->type == AV_HWDEVICE_TYPE_VULKAN) + vkhwctx = avhwctx->hwctx; + } + + RET(init_vulkan(ctx, vkhwctx)); while ((desc = av_pix_fmt_desc_next(desc))) { enum AVPixelFormat pixfmt = av_pix_fmt_desc_get_id(desc); @@ -710,6 +709,10 @@ static int libplacebo_query_format(AVFilterContext *ctx) continue; #endif + if (pixfmt == AV_PIX_FMT_VULKAN && vkhwctx && + vkhwctx->act_dev != s->vulkan->device) + continue; + if (!pl_test_pixfmt(s->gpu, pixfmt)) continue;