From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 82A9B4F3BB for ; Mon, 16 Jun 2025 18:05:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 631BA687D7B; Mon, 16 Jun 2025 21:05:34 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9CFA068D7AC for ; Mon, 16 Jun 2025 21:05:32 +0300 (EEST) Received: from haasn.dev (unknown [10.30.1.1]) by haasn.dev (Postfix) with UTF8SMTP id 5F8B4406B8; Mon, 16 Jun 2025 20:05:32 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jun 2025 20:05:28 +0200 Message-ID: <20250616180530.140914-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/vf_libplacebo: list AV_PIX_FMT_VULKAN first 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 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: Niklas Haas Under normal circumstances, this change does not affect anything, as the vast majority of filters either support only vulkan or only software formats. However, when a filter supports both (such as vf_libplacebo itself, and possibly vf_scale in the future), linking together two such filter instances without an explicit format will default matching the input format, resulting in a redundant round trip through host RAM. This change bumps up AV_PIX_FMT_VULKAN to the first entry in the format list, ensuring that it gets preferred whenever possible. --- libavfilter/vf_libplacebo.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 9ff64053cc..c7a1b15f92 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -1150,8 +1150,17 @@ static int libplacebo_query_format(const AVFilterContext *ctx, const AVPixFmtDescriptor *desc = NULL; AVFilterFormats *infmts = NULL, *outfmts = NULL; + /* List AV_PIX_FMT_VULKAN first to prefer it when possible */ + if (s->have_hwdevice) { + RET(ff_add_format(&infmts, AV_PIX_FMT_VULKAN)); + if (s->out_format == AV_PIX_FMT_NONE || av_vkfmt_from_pixfmt(s->out_format)) + RET(ff_add_format(&outfmts, AV_PIX_FMT_VULKAN)); + } + while ((desc = av_pix_fmt_desc_next(desc))) { enum AVPixelFormat pixfmt = av_pix_fmt_desc_get_id(desc); + if (pixfmt == AV_PIX_FMT_VULKAN) + continue; /* Handled above */ #if PL_API_VER < 232 // Older libplacebo can't handle >64-bit pixel formats, so safe-guard @@ -1160,9 +1169,6 @@ static int libplacebo_query_format(const AVFilterContext *ctx, continue; #endif - if (pixfmt == AV_PIX_FMT_VULKAN && !s->have_hwdevice) - continue; - if (!pl_test_pixfmt(s->gpu, pixfmt)) continue; @@ -1173,15 +1179,8 @@ static int libplacebo_query_format(const AVFilterContext *ctx, continue; /* BE formats are not supported by pl_download_avframe */ /* Mask based on user specified format */ - if (s->out_format != AV_PIX_FMT_NONE) { - if (pixfmt == AV_PIX_FMT_VULKAN && av_vkfmt_from_pixfmt(s->out_format)) { - /* OK */ - } else if (pixfmt == s->out_format) { - /* OK */ - } else { - continue; /* Not OK */ - } - } + if (pixfmt != s->out_format && s->out_format != AV_PIX_FMT_NONE) + continue; #if PL_API_VER >= 293 if (!pl_test_pixfmt_caps(s->gpu, pixfmt, PL_FMT_CAP_RENDERABLE)) -- 2.49.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".