242 lines
8.8 KiB
Diff
242 lines
8.8 KiB
Diff
|
|
From 5ab1ba5414cdc01e62910cd5f235fc9bb045578e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marek Vasut <marex@denx.de>
|
||
|
|
Date: Sun, 21 May 2023 00:02:55 +0200
|
||
|
|
Subject: [PATCH 1/9] rgb2bayer: Support video/x-bayer 10/12/14/16 bit depths
|
||
|
|
|
||
|
|
Add support for conversion to 10/12/14/16 bit bayer pattern.
|
||
|
|
The implementation is rather simplistic, just take the ARGB
|
||
|
|
input, generate 16-bit data out of it instead of 8-bit, shift
|
||
|
|
them as required by the output bitness, and apply endian swap.
|
||
|
|
|
||
|
|
Example usage:
|
||
|
|
```
|
||
|
|
$ gst-launch-1.0 videotestsrc num-buffers=1 ! \
|
||
|
|
video/x-raw,width=512,height=512,format=ARGB ! \
|
||
|
|
rgb2bayer ! \
|
||
|
|
video/x-bayer,format=bggr12le ! \
|
||
|
|
filesink location=/tmp/bayer12.raw
|
||
|
|
```
|
||
|
|
|
||
|
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/0763fb107d4f5e05991283d8a7861511820596ac]
|
||
|
|
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4686>
|
||
|
|
---
|
||
|
|
docs/plugins/gst_plugins_cache.json | 2 +-
|
||
|
|
gst/bayer/gstrgb2bayer.c | 116 +++++++++++++++++++++++-----
|
||
|
|
gst/bayer/gstrgb2bayer.h | 2 +
|
||
|
|
3 files changed, 101 insertions(+), 19 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json
|
||
|
|
index 7ede158aff..7b09ab6b9c 100644
|
||
|
|
--- a/docs/plugins/gst_plugins_cache.json
|
||
|
|
+++ b/docs/plugins/gst_plugins_cache.json
|
||
|
|
@@ -3975,7 +3975,7 @@
|
||
|
|
"presence": "always"
|
||
|
|
},
|
||
|
|
"src": {
|
||
|
|
- "caps": "video/x-bayer:\n format: { bggr, gbrg, grbg, rggb }\n width: [ 1, 2147483647 ]\n height: [ 1, 2147483647 ]\n framerate: [ 0/1, 2147483647/1 ]\n",
|
||
|
|
+ "caps": "video/x-bayer:\n format: { bggr, rggb, grbg, gbrg, bggr10le, rggb10le, grbg10le, gbrg10le, bggr10be, rggb10be, grbg10be, gbrg10be, bggr12le, rggb12le, grbg12le, gbrg12le, bggr12be, rggb12be, grbg12be, gbrg12be, bggr14le, rggb14le, grbg14le, gbrg14le, bggr14be, rggb14be, grbg14be, gbrg14be, bggr16le, rggb16le, grbg16le, gbrg16le, bggr16be, rggb16be, grbg16be, gbrg16be }\n width: [ 1, 2147483647 ]\n height: [ 1, 2147483647 ]\n framerate: [ 0/1, 2147483647/1 ]\n",
|
||
|
|
"direction": "src",
|
||
|
|
"presence": "always"
|
||
|
|
}
|
||
|
|
diff --git a/gst/bayer/gstrgb2bayer.c b/gst/bayer/gstrgb2bayer.c
|
||
|
|
index 8adeb779a9..4e3c2ad8e3 100644
|
||
|
|
--- a/gst/bayer/gstrgb2bayer.c
|
||
|
|
+++ b/gst/bayer/gstrgb2bayer.c
|
||
|
|
@@ -28,6 +28,8 @@
|
||
|
|
#include "gstbayerelements.h"
|
||
|
|
#include "gstrgb2bayer.h"
|
||
|
|
|
||
|
|
+#define DIV_ROUND_UP(s,v) (((s) + ((v)-1)) / (v))
|
||
|
|
+
|
||
|
|
#define GST_CAT_DEFAULT gst_rgb2bayer_debug
|
||
|
|
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
|
||
|
|
|
||
|
|
@@ -64,12 +66,32 @@ static GstStaticPadTemplate gst_rgb2bayer_sink_template =
|
||
|
|
);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#define BAYER_CAPS_GEN(mask, bits, endian) \
|
||
|
|
+ " "#mask#bits#endian
|
||
|
|
+
|
||
|
|
+#define BAYER_CAPS_ORD(bits, endian) \
|
||
|
|
+ BAYER_CAPS_GEN(bggr, bits, endian)"," \
|
||
|
|
+ BAYER_CAPS_GEN(rggb, bits, endian)"," \
|
||
|
|
+ BAYER_CAPS_GEN(grbg, bits, endian)"," \
|
||
|
|
+ BAYER_CAPS_GEN(gbrg, bits, endian)
|
||
|
|
+
|
||
|
|
+#define BAYER_CAPS_BITS(bits) \
|
||
|
|
+ BAYER_CAPS_ORD(bits, le)"," \
|
||
|
|
+ BAYER_CAPS_ORD(bits, be)
|
||
|
|
+
|
||
|
|
+#define BAYER_CAPS_ALL \
|
||
|
|
+ BAYER_CAPS_ORD(,)"," \
|
||
|
|
+ BAYER_CAPS_BITS(10)"," \
|
||
|
|
+ BAYER_CAPS_BITS(12)"," \
|
||
|
|
+ BAYER_CAPS_BITS(14)"," \
|
||
|
|
+ BAYER_CAPS_BITS(16)
|
||
|
|
+
|
||
|
|
static GstStaticPadTemplate gst_rgb2bayer_src_template =
|
||
|
|
GST_STATIC_PAD_TEMPLATE ("src",
|
||
|
|
GST_PAD_SRC,
|
||
|
|
GST_PAD_ALWAYS,
|
||
|
|
GST_STATIC_CAPS ("video/x-bayer,"
|
||
|
|
- "format=(string){bggr,gbrg,grbg,rggb},"
|
||
|
|
+ "format=(string){" BAYER_CAPS_ALL " },"
|
||
|
|
"width=[1,MAX],height=[1,MAX]," "framerate=(fraction)[0/1,MAX]")
|
||
|
|
);
|
||
|
|
|
||
|
|
@@ -164,6 +186,7 @@ static gboolean
|
||
|
|
gst_rgb2bayer_get_unit_size (GstBaseTransform * trans, GstCaps * caps,
|
||
|
|
gsize * size)
|
||
|
|
{
|
||
|
|
+ GstRGB2Bayer *rgb2bayer = GST_RGB_2_BAYER (trans);
|
||
|
|
GstStructure *structure;
|
||
|
|
int width;
|
||
|
|
int height;
|
||
|
|
@@ -176,7 +199,8 @@ gst_rgb2bayer_get_unit_size (GstBaseTransform * trans, GstCaps * caps,
|
||
|
|
name = gst_structure_get_name (structure);
|
||
|
|
/* Our name must be either video/x-bayer video/x-raw */
|
||
|
|
if (g_str_equal (name, "video/x-bayer")) {
|
||
|
|
- *size = GST_ROUND_UP_4 (width) * height;
|
||
|
|
+ *size =
|
||
|
|
+ GST_ROUND_UP_4 (width) * height * DIV_ROUND_UP (rgb2bayer->bpp, 8);
|
||
|
|
return TRUE;
|
||
|
|
} else {
|
||
|
|
/* For output, calculate according to format */
|
||
|
|
@@ -212,21 +236,53 @@ gst_rgb2bayer_set_caps (GstBaseTransform * trans, GstCaps * incaps,
|
||
|
|
gst_structure_get_int (structure, "height", &rgb2bayer->height);
|
||
|
|
|
||
|
|
format = gst_structure_get_string (structure, "format");
|
||
|
|
- if (g_str_equal (format, "bggr")) {
|
||
|
|
+ if (g_str_has_prefix (format, "bggr")) {
|
||
|
|
rgb2bayer->format = GST_RGB_2_BAYER_FORMAT_BGGR;
|
||
|
|
- } else if (g_str_equal (format, "gbrg")) {
|
||
|
|
+ } else if (g_str_has_prefix (format, "gbrg")) {
|
||
|
|
rgb2bayer->format = GST_RGB_2_BAYER_FORMAT_GBRG;
|
||
|
|
- } else if (g_str_equal (format, "grbg")) {
|
||
|
|
+ } else if (g_str_has_prefix (format, "grbg")) {
|
||
|
|
rgb2bayer->format = GST_RGB_2_BAYER_FORMAT_GRBG;
|
||
|
|
- } else if (g_str_equal (format, "rggb")) {
|
||
|
|
+ } else if (g_str_has_prefix (format, "rggb")) {
|
||
|
|
rgb2bayer->format = GST_RGB_2_BAYER_FORMAT_RGGB;
|
||
|
|
} else {
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (strlen (format) == 4) { /* 8bit bayer */
|
||
|
|
+ rgb2bayer->bpp = 8;
|
||
|
|
+ } else if (strlen (format) == 8) { /* 10/12/14/16 le/be bayer */
|
||
|
|
+ rgb2bayer->bpp = (gint) g_ascii_strtoull (format + 4, NULL, 10);
|
||
|
|
+ if (rgb2bayer->bpp & 1) /* odd rgb2bayer->bpp bayer formats not supported */
|
||
|
|
+ return FALSE;
|
||
|
|
+ if (rgb2bayer->bpp < 10 || rgb2bayer->bpp > 16) /* bayer 10,12,14,16 only */
|
||
|
|
+ return FALSE;
|
||
|
|
+
|
||
|
|
+ if (g_str_has_suffix (format, "le"))
|
||
|
|
+ rgb2bayer->bigendian = 0;
|
||
|
|
+ else if (g_str_has_suffix (format, "be"))
|
||
|
|
+ rgb2bayer->bigendian = 1;
|
||
|
|
+ else
|
||
|
|
+ return FALSE;
|
||
|
|
+ } else
|
||
|
|
+ return FALSE;
|
||
|
|
+
|
||
|
|
return TRUE;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static guint16
|
||
|
|
+bayer_scale_and_swap (GstRGB2Bayer * rgb2bayer, guint8 r8)
|
||
|
|
+{
|
||
|
|
+ guint16 r16 = (r8 << (rgb2bayer->bpp - 8)) | (r8 >> (16 - rgb2bayer->bpp));
|
||
|
|
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||
|
|
+ if (rgb2bayer->bigendian)
|
||
|
|
+ r16 = GUINT16_SWAP_LE_BE (r16);
|
||
|
|
+#else
|
||
|
|
+ if (!rgb2bayer->bigendian)
|
||
|
|
+ r16 = GUINT16_SWAP_LE_BE (r16);
|
||
|
|
+#endif
|
||
|
|
+ return r16;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static GstFlowReturn
|
||
|
|
gst_rgb2bayer_transform (GstBaseTransform * trans, GstBuffer * inbuf,
|
||
|
|
GstBuffer * outbuf)
|
||
|
|
@@ -239,6 +295,7 @@ gst_rgb2bayer_transform (GstBaseTransform * trans, GstBuffer * inbuf,
|
||
|
|
int height = rgb2bayer->height;
|
||
|
|
int width = rgb2bayer->width;
|
||
|
|
GstVideoFrame frame;
|
||
|
|
+ int bayer16 = (rgb2bayer->bpp > 8);
|
||
|
|
|
||
|
|
if (!gst_video_frame_map (&frame, &rgb2bayer->info, inbuf, GST_MAP_READ))
|
||
|
|
goto map_failed;
|
||
|
|
@@ -251,18 +308,41 @@ gst_rgb2bayer_transform (GstBaseTransform * trans, GstBuffer * inbuf,
|
||
|
|
dest = map.data;
|
||
|
|
src = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0);
|
||
|
|
|
||
|
|
- for (j = 0; j < height; j++) {
|
||
|
|
- guint8 *dest_line = dest + GST_ROUND_UP_4 (width) * j;
|
||
|
|
- guint8 *src_line = src + frame.info.stride[0] * j;
|
||
|
|
-
|
||
|
|
- for (i = 0; i < width; i++) {
|
||
|
|
- int is_blue = ((j & 1) << 1) | (i & 1);
|
||
|
|
- if (is_blue == rgb2bayer->format) {
|
||
|
|
- dest_line[i] = src_line[i * 4 + 3];
|
||
|
|
- } else if ((is_blue ^ 3) == rgb2bayer->format) {
|
||
|
|
- dest_line[i] = src_line[i * 4 + 1];
|
||
|
|
- } else {
|
||
|
|
- dest_line[i] = src_line[i * 4 + 2];
|
||
|
|
+ if (bayer16) {
|
||
|
|
+ for (j = 0; j < height; j++) {
|
||
|
|
+ guint16 *dest_line16 = (guint16 *)
|
||
|
|
+ (dest + GST_ROUND_UP_4 (width) * j * DIV_ROUND_UP (rgb2bayer->bpp,
|
||
|
|
+ 8));
|
||
|
|
+ guint8 *src_line = src + frame.info.stride[0] * j;
|
||
|
|
+
|
||
|
|
+ for (i = 0; i < width; i++) {
|
||
|
|
+ int is_blue = ((j & 1) << 1) | (i & 1);
|
||
|
|
+ if (is_blue == rgb2bayer->format) {
|
||
|
|
+ dest_line16[i] =
|
||
|
|
+ bayer_scale_and_swap (rgb2bayer, src_line[i * 4 + 3]);
|
||
|
|
+ } else if ((is_blue ^ 3) == rgb2bayer->format) {
|
||
|
|
+ dest_line16[i] =
|
||
|
|
+ bayer_scale_and_swap (rgb2bayer, src_line[i * 4 + 1]);
|
||
|
|
+ } else {
|
||
|
|
+ dest_line16[i] =
|
||
|
|
+ bayer_scale_and_swap (rgb2bayer, src_line[i * 4 + 2]);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ } else {
|
||
|
|
+ for (j = 0; j < height; j++) {
|
||
|
|
+ guint8 *dest_line = dest + GST_ROUND_UP_4 (width) * j;
|
||
|
|
+ guint8 *src_line = src + frame.info.stride[0] * j;
|
||
|
|
+
|
||
|
|
+ for (i = 0; i < width; i++) {
|
||
|
|
+ int is_blue = ((j & 1) << 1) | (i & 1);
|
||
|
|
+ if (is_blue == rgb2bayer->format) {
|
||
|
|
+ dest_line[i] = src_line[i * 4 + 3];
|
||
|
|
+ } else if ((is_blue ^ 3) == rgb2bayer->format) {
|
||
|
|
+ dest_line[i] = src_line[i * 4 + 1];
|
||
|
|
+ } else {
|
||
|
|
+ dest_line[i] = src_line[i * 4 + 2];
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
diff --git a/gst/bayer/gstrgb2bayer.h b/gst/bayer/gstrgb2bayer.h
|
||
|
|
index b6e79fd4e2..b2eade10f2 100644
|
||
|
|
--- a/gst/bayer/gstrgb2bayer.h
|
||
|
|
+++ b/gst/bayer/gstrgb2bayer.h
|
||
|
|
@@ -49,6 +49,8 @@ struct _GstRGB2Bayer
|
||
|
|
GstVideoInfo info;
|
||
|
|
int width, height;
|
||
|
|
int format;
|
||
|
|
+ int bpp;
|
||
|
|
+ int bigendian;
|
||
|
|
};
|
||
|
|
|
||
|
|
struct _GstRGB2BayerClass
|
||
|
|
--
|
||
|
|
2.44.1
|
||
|
|
|