From c211ce14aeeb1cb794f6a16f9fcbfab60ff5025e Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Thu, 26 Feb 2026 14:40:07 +0100
Subject: [PATCH] vdec/jpegxs: same change as prev but for R12L/RG48

fixed example as in previous commit but replacing testcard for c=R10k
and decoded to RG48
---
 src/from_planar.c               | 16 ++++++++--------
 src/from_planar.h               |  4 ++--
 src/video_decompress/jpegxs.cpp |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/from_planar.c b/src/from_planar.c
index a8376ed1a..e68143a27 100644
--- a/src/from_planar.c
+++ b/src/from_planar.c
@@ -145,13 +145,13 @@ gbrp16le_to_r12l(struct from_planar_data d)
 }
 
 void
-rgbp12le_to_r12l(struct from_planar_data d)
+rgbpXXle_to_r12l(struct from_planar_data d)
 {
-        gbrpXXle_to_r12l(d, DEPTH12, 0, 1, 2);
+        gbrpXXle_to_r12l(d, d.in_depth, 0, 1, 2);
 }
 
 static void
-rgbpXXle_to_rg48(struct from_planar_data d, const int in_depth, int rind, int gind, int bind)
+rgbpXXle_to_rg48_int(struct from_planar_data d, const int in_depth, int rind, int gind, int bind)
 {
         assert((uintptr_t) d.out_data % 2 == 0);
         assert((uintptr_t) d.in_data[0] % 2 == 0);
@@ -175,25 +175,25 @@ rgbpXXle_to_rg48(struct from_planar_data d, const int in_depth, int rind, int gi
 void
 gbrp10le_to_rg48(struct from_planar_data d)
 {
-        rgbpXXle_to_rg48(d, DEPTH10, 2, 0, 1);
+        rgbpXXle_to_rg48_int(d, DEPTH10, 2, 0, 1);
 }
 
 void
 gbrp12le_to_rg48(struct from_planar_data d)
 {
-        rgbpXXle_to_rg48(d, DEPTH12, 2, 0, 1);
+        rgbpXXle_to_rg48_int(d, DEPTH12, 2, 0, 1);
 }
 
 void
 gbrp16le_to_rg48(struct from_planar_data d)
 {
-        rgbpXXle_to_rg48(d, DEPTH16, 2, 0, 1);
+        rgbpXXle_to_rg48_int(d, DEPTH16, 2, 0, 1);
 }
 
 void
-rgbp12le_to_rg48(struct from_planar_data d)
+rgbpXXle_to_rg48(struct from_planar_data d)
 {
-        rgbpXXle_to_rg48(d, DEPTH12, 0, 1, 2);
+        rgbpXXle_to_rg48_int(d, d.in_depth, 0, 1, 2);
 }
 
 static void
diff --git a/src/from_planar.h b/src/from_planar.h
index 10eab3ec1..eb52b027a 100644
--- a/src/from_planar.h
+++ b/src/from_planar.h
@@ -58,11 +58,11 @@ struct from_planar_data {
 typedef void         decode_planar_func_t(struct from_planar_data d);
 decode_planar_func_t gbrp12le_to_r12l;
 decode_planar_func_t gbrp16le_to_r12l;
-decode_planar_func_t rgbp12le_to_r12l;
+decode_planar_func_t rgbpXXle_to_r12l;
 decode_planar_func_t gbrp10le_to_rg48;
 decode_planar_func_t gbrp12le_to_rg48;
 decode_planar_func_t gbrp16le_to_rg48;
-decode_planar_func_t rgbp12le_to_rg48;
+decode_planar_func_t rgbpXXle_to_rg48;
 decode_planar_func_t gbrp10le_to_r10k;
 decode_planar_func_t gbrp12le_to_r10k;
 decode_planar_func_t gbrp16le_to_r10k;
diff --git a/src/video_decompress/jpegxs.cpp b/src/video_decompress/jpegxs.cpp
index 28be28f37..ce763b0e7 100644
--- a/src/video_decompress/jpegxs.cpp
+++ b/src/video_decompress/jpegxs.cpp
@@ -87,8 +87,8 @@ static const struct jpegxs_to_uv_conversion jpegxs_to_uv_conversions[] = {
         { COLOUR_FORMAT_PLANAR_YUV444_OR_RGB, RGB,  1, rgbp_to_rgb      },
         { COLOUR_FORMAT_PLANAR_YUV422,        v210, 2, yuv422p10le_to_v210},
         { COLOUR_FORMAT_PLANAR_YUV444_OR_RGB, R10k, 2, rgbpXXle_to_r10k },
-        { COLOUR_FORMAT_PLANAR_YUV444_OR_RGB, R12L, 2, rgbp12le_to_r12l },
-        { COLOUR_FORMAT_PLANAR_YUV444_OR_RGB, RG48, 2, rgbp12le_to_rg48 },
+        { COLOUR_FORMAT_PLANAR_YUV444_OR_RGB, R12L, 2, rgbpXXle_to_r12l },
+        { COLOUR_FORMAT_PLANAR_YUV444_OR_RGB, RG48, 2, rgbpXXle_to_rg48 },
 };
 
 static const struct jpegxs_to_uv_conversion *