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 ESMTPS id 31B7E4CB05 for ; Mon, 24 Feb 2025 08:06:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E39D068CD69; Mon, 24 Feb 2025 10:04:55 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3CF768CBB5 for ; Mon, 24 Feb 2025 10:04:39 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1740384279; bh=/QRhiqBimhTn93QBgZPmkJw N60M77b5bvXRW08uqes4=; b=Gi2+D14beDwwrK6v5J91MJh3TA4aEVhsqcI8Wwwa16ncSFMZwm //EkJlQgakzYgf8kePp7YO+qdQUz6ILLUIJLMr6sF/fwG9/ENhkN+jAtRsilGD/6lBxZ74AwSNI pn+TyUv3rppYOYcUaBIfQqWzkq6JRD2+wR6HTM537Gy938eJ5nOHJT4pDIzP0ZeeUNuX67P5WFV d2duFGgu1KzcsTludf5pHkxJzBsUskbDTSTWpFIjW9rByN5ipzsi+Xj1L4p2ssFw35srVihXCkg yC3Il1zsm7QcW+236wcArp0fy2k6k6cVAcFpuNKg9YY2CrUOwH00h6ofKR/k2bJXNiw==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1740384279; bh=/QRhiqBimhTn93QBgZPmkJw N60M77b5bvXRW08uqes4=; b=inC1U7dCEU6461QAU9eb3aZj03Jvb4naI9mUW9aOkTig5zQCKx x3KMe8/Fo9JyBB+LUPA2OB3AgYqZXytyofDA==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Feb 2025 09:04:22 +0100 Message-ID: <20250224080434.5632-9-dev@lynne.ee> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250224080434.5632-1-dev@lynne.ee> References: <20250224080434.5632-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 09/12] vulkan: unify handling of BGR and simplify ffv1_rct 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: Lynne 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: --- libavcodec/ffv1_vulkan.h | 1 + libavcodec/ffv1enc_vulkan.c | 2 ++ libavcodec/vulkan/ffv1_enc_rct.comp | 17 ++++++------- libavutil/vulkan.c | 38 +++++++++++++++++++++++++++++ libavutil/vulkan.h | 6 +++++ 5 files changed, 54 insertions(+), 10 deletions(-) diff --git a/libavcodec/ffv1_vulkan.h b/libavcodec/ffv1_vulkan.h index 0da6dc2d33..599afae66e 100644 --- a/libavcodec/ffv1_vulkan.h +++ b/libavcodec/ffv1_vulkan.h @@ -37,6 +37,7 @@ int ff_ffv1_vk_init_crc_table_data(FFVulkanContext *s, FFVkBuffer *vkb, FFV1Context *f); typedef struct FFv1VkRCTParameters { + int fmt_lut[4]; int offset; uint8_t bits; uint8_t planar_rgb; diff --git a/libavcodec/ffv1enc_vulkan.c b/libavcodec/ffv1enc_vulkan.c index 88801ca8e6..225d478fb7 100644 --- a/libavcodec/ffv1enc_vulkan.c +++ b/libavcodec/ffv1enc_vulkan.c @@ -264,6 +264,7 @@ static int run_rct(AVCodecContext *avctx, FFVkExecContext *exec, (ff_vk_count_images((AVVkFrame *)enc_in->data[0]) > 1), .transparency = f->transparency, }; + ff_vk_set_perm(src_hwfc->sw_format, pd.fmt_lut); ff_vk_shader_update_push_const(&fv->s, exec, &fv->rct, VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(pd), &pd); @@ -1157,6 +1158,7 @@ static int init_rct_shader(AVCodecContext *avctx, FFVkSPIRVCompiler *spv) GLSLD(ff_source_common_comp); GLSLC(0, layout(push_constant, scalar) uniform pushConstants { ); + GLSLC(1, ivec4 fmt_lut; ); GLSLC(1, int offset; ); GLSLC(1, uint8_t bits; ); GLSLC(1, uint8_t planar_rgb; ); diff --git a/libavcodec/vulkan/ffv1_enc_rct.comp b/libavcodec/vulkan/ffv1_enc_rct.comp index a615381c90..b611f4be98 100644 --- a/libavcodec/vulkan/ffv1_enc_rct.comp +++ b/libavcodec/vulkan/ffv1_enc_rct.comp @@ -22,17 +22,14 @@ ivec4 load_components(ivec2 pos) { - if (planar_rgb == 0) - return ivec4(imageLoad(src[0], pos)); + ivec4 pix = ivec4(imageLoad(src[0], pos)); + if (planar_rgb != 0) { + for (int i = 1; i < (3 + transparency); i++) + pix[i] = int(imageLoad(src[i], pos)[0]); + } - ivec4 pix; - for (int i = 0; i < (3 + transparency); i++) - pix[i] = int(imageLoad(src[i], pos)[0]); - - /* Swizzle out the difference */ - if (bits > 8 && bits < 16 && transparency == 0) - return pix.bgra; - return pix.brga; + return ivec4(pix[fmt_lut[0]], pix[fmt_lut[1]], + pix[fmt_lut[2]], pix[fmt_lut[3]]); } void bypass_sample(ivec2 pos) diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index 40ca737422..26d7e9e600 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -1468,6 +1468,44 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt) return 0; } +void ff_vk_set_perm(enum AVPixelFormat pix_fmt, int lut[4]) +{ + switch (pix_fmt) { + case AV_PIX_FMT_BGRA: + case AV_PIX_FMT_BGR0: + case AV_PIX_FMT_BGR565: + case AV_PIX_FMT_X2BGR10: + lut[0] = 2; + lut[1] = 1; + lut[2] = 0; + lut[3] = 3; + return; + case AV_PIX_FMT_GBRAP: + case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_GBRAP10: + case AV_PIX_FMT_GBRAP12: + case AV_PIX_FMT_GBRAP14: + case AV_PIX_FMT_GBRAP16: + case AV_PIX_FMT_GBRP10: + case AV_PIX_FMT_GBRP12: + case AV_PIX_FMT_GBRP14: + case AV_PIX_FMT_GBRP16: + case AV_PIX_FMT_GBRPF32: + case AV_PIX_FMT_GBRAPF32: + lut[0] = 2; + lut[1] = 0; + lut[2] = 1; + lut[3] = 3; + return; + default: + lut[0] = 0; + lut[1] = 1; + lut[2] = 2; + lut[3] = 3; + return; + } +} + const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt, enum FFVkShaderRepFormat rep_fmt) { diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index 327ce2b286..1be432ed5e 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -371,6 +371,12 @@ const char *ff_vk_ret2str(VkResult res); */ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt); +/** + * Since storage images may not be swizzled, we have to do this in the + * shader itself. This fills in a lookup table to do it. + */ +void ff_vk_set_perm(enum AVPixelFormat pix_fmt, int lut[4]); + /** * Get the aspect flag for a plane from an image. */ -- 2.47.2 _______________________________________________ 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".