diff mbox series

[meta-arago,master/kirkstone,v3] gstreamer1.0-plugins-good: Add patches for raw10/12/16 and IR formats

Message ID 20230630214351.12470-1-reatmon@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master/kirkstone,v3] gstreamer1.0-plugins-good: Add patches for raw10/12/16 and IR formats | expand

Commit Message

Ryan Eatmon June 30, 2023, 9:43 p.m. UTC 
From: Rahul T R <r-ravikumar@ti.com>

Add patches to support 10/12/16 bayer formats and bayer formats with
IR components. This are required to support capture from imx390 and
ov2312 cameras using gstreamer v4l2src

Signed-off-by: Rahul T R <r-ravikumar@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---

Notes:
    v3: Renamed patches and reordered them, one is dependent on the
        other being applied first.
    v2:
        Dropped first 2 parts in the title
        Wrapped the commit message to 70 chars

 ...-raw10-raw12-and-raw16-bayer-formats.patch | 123 ++++++++++++++++++
 ...-for-bayer-formats-with-IR-component.patch | 121 +++++++++++++++++
 .../gstreamer1.0-plugins-good_1.20.%.bbappend |   5 +
 3 files changed, 249 insertions(+)
 create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-Adding-support-for-raw10-raw12-and-raw16-bayer-formats.patch
 create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-Adding-support-for-bayer-formats-with-IR-component.patch
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-Adding-support-for-raw10-raw12-and-raw16-bayer-formats.patch b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-Adding-support-for-raw10-raw12-and-raw16-bayer-formats.patch
new file mode 100644
index 00000000..751f5ba5
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-Adding-support-for-raw10-raw12-and-raw16-bayer-formats.patch
@@ -0,0 +1,123 @@ 
+From: Emmanuel Madrigal <emmanuel.madrigal@ridgerun.com>
+Date: Tue Feb 22 03:50:52 IST 2022
+Subject: Adding support for raw10, raw12 and raw16 bayer formats
+
+Gstreamer 1.16 only supports raw8 bayer by default. This patch enables
+sensors that support raw10, raw12 or raw16 to be used with v4l2src.
+Will need to be carried in meta-psdkla as long as we are using Gstreamer 1.16
+
+Upstream-Status: Pending
+Signed-off-by: Limaye, Aniket <a-limaye@ti.com>
+
+diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
+index 2c78e2227..a5d2e2de1 100644
+--- a/sys/v4l2/gstv4l2object.c
++++ b/sys/v4l2/gstv4l2object.c
+@@ -162,6 +162,18 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = {
+   {V4L2_PIX_FMT_SGBRG8, TRUE, GST_V4L2_RAW},
+   {V4L2_PIX_FMT_SGRBG8, TRUE, GST_V4L2_RAW},
+   {V4L2_PIX_FMT_SRGGB8, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SBGGR10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGBRG10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGRBG10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SRGGB10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SBGGR12, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGBRG12, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGRBG12, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SRGGB12, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SBGGR16, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGBRG16, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGRBG16, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SRGGB16, TRUE, GST_V4L2_RAW},
+
+   /* compressed formats */
+   {V4L2_PIX_FMT_MJPEG, FALSE, GST_V4L2_CODEC},
+@@ -1105,6 +1117,18 @@ gst_v4l2_object_format_get_rank (const struct v4l2_fmtdesc *fmt)
+     case V4L2_PIX_FMT_SGBRG8:
+     case V4L2_PIX_FMT_SGRBG8:
+     case V4L2_PIX_FMT_SRGGB8:
++    case V4L2_PIX_FMT_SBGGR10:
++    case V4L2_PIX_FMT_SGBRG10:
++    case V4L2_PIX_FMT_SGRBG10:
++    case V4L2_PIX_FMT_SRGGB10:
++    case V4L2_PIX_FMT_SBGGR12:
++    case V4L2_PIX_FMT_SGBRG12:
++    case V4L2_PIX_FMT_SGRBG12:
++    case V4L2_PIX_FMT_SRGGB12:
++    case V4L2_PIX_FMT_SBGGR16:
++    case V4L2_PIX_FMT_SGBRG16:
++    case V4L2_PIX_FMT_SGRBG16:
++    case V4L2_PIX_FMT_SRGGB16:
+       rank = BAYER_BASE_RANK;
+       break;
+
+@@ -1521,7 +1545,37 @@ gst_v4l2_object_v4l2fourcc_to_bare_struct (guint32 fourcc)
+           fourcc == V4L2_PIX_FMT_SBGGR8 ? "bggr" :
+           fourcc == V4L2_PIX_FMT_SGBRG8 ? "gbrg" :
+           fourcc == V4L2_PIX_FMT_SGRBG8 ? "grbg" :
+-          /* fourcc == V4L2_PIX_FMT_SRGGB8 ? */ "rggb", NULL);
++          fourcc == V4L2_PIX_FMT_SRGGB8 ? "rggb" : "rggb", NULL);
++      break;
++    case V4L2_PIX_FMT_SBGGR10:
++    case V4L2_PIX_FMT_SGBRG10:
++    case V4L2_PIX_FMT_SGRBG10:
++    case V4L2_PIX_FMT_SRGGB10:
++      structure = gst_structure_new ("video/x-bayer", "format", G_TYPE_STRING,
++          fourcc == V4L2_PIX_FMT_SBGGR10 ? "bggr10" :
++          fourcc == V4L2_PIX_FMT_SGBRG10 ? "gbrg10" :
++          fourcc == V4L2_PIX_FMT_SGRBG10 ? "grbg10" :
++          fourcc == V4L2_PIX_FMT_SRGGB10 ? "rggb10" : "rggb10", NULL);
++      break;
++    case V4L2_PIX_FMT_SBGGR12:
++    case V4L2_PIX_FMT_SGBRG12:
++    case V4L2_PIX_FMT_SGRBG12:
++    case V4L2_PIX_FMT_SRGGB12:
++      structure = gst_structure_new ("video/x-bayer", "format", G_TYPE_STRING,
++          fourcc == V4L2_PIX_FMT_SBGGR12 ? "bggr12" :
++          fourcc == V4L2_PIX_FMT_SGBRG12 ? "gbrg12" :
++          fourcc == V4L2_PIX_FMT_SGRBG12 ? "grbg12" :
++          fourcc == V4L2_PIX_FMT_SRGGB12 ? "rggb12" : "rggb12", NULL);
++      break;
++    case V4L2_PIX_FMT_SBGGR16:
++    case V4L2_PIX_FMT_SGBRG16:
++    case V4L2_PIX_FMT_SGRBG16:
++    case V4L2_PIX_FMT_SRGGB16:
++      structure = gst_structure_new ("video/x-bayer", "format", G_TYPE_STRING,
++          fourcc == V4L2_PIX_FMT_SBGGR16 ? "bggr16" :
++          fourcc == V4L2_PIX_FMT_SGBRG16 ? "gbrg16" :
++          fourcc == V4L2_PIX_FMT_SGRBG16 ? "grbg16" :
++          fourcc == V4L2_PIX_FMT_SRGGB16 ? "rggb16" : "rggb16", NULL);
+       break;
+     case V4L2_PIX_FMT_SN9C10X:
+       structure = gst_structure_new_empty ("video/x-sonix");
+@@ -1847,6 +1901,30 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps,
+           fourcc = V4L2_PIX_FMT_SGRBG8;
+         else if (!g_ascii_strcasecmp (format, "rggb"))
+           fourcc = V4L2_PIX_FMT_SRGGB8;
++        else if (!g_ascii_strcasecmp (format, "bggr10"))
++          fourcc = V4L2_PIX_FMT_SBGGR10;
++        else if (!g_ascii_strcasecmp (format, "gbrg10"))
++          fourcc = V4L2_PIX_FMT_SGBRG10;
++        else if (!g_ascii_strcasecmp (format, "grbg10"))
++          fourcc = V4L2_PIX_FMT_SGRBG10;
++        else if (!g_ascii_strcasecmp (format, "rggb10"))
++          fourcc = V4L2_PIX_FMT_SRGGB10;
++        else if (!g_ascii_strcasecmp (format, "bggr12"))
++          fourcc = V4L2_PIX_FMT_SBGGR12;
++        else if (!g_ascii_strcasecmp (format, "gbrg12"))
++          fourcc = V4L2_PIX_FMT_SGBRG12;
++        else if (!g_ascii_strcasecmp (format, "grbg12"))
++          fourcc = V4L2_PIX_FMT_SGRBG12;
++        else if (!g_ascii_strcasecmp (format, "rggb12"))
++          fourcc = V4L2_PIX_FMT_SRGGB12;
++        else if (!g_ascii_strcasecmp (format, "bggr16"))
++          fourcc = V4L2_PIX_FMT_SBGGR16;
++        else if (!g_ascii_strcasecmp (format, "gbrg16"))
++          fourcc = V4L2_PIX_FMT_SGBRG16;
++        else if (!g_ascii_strcasecmp (format, "grbg16"))
++          fourcc = V4L2_PIX_FMT_SGRBG16;
++        else if (!g_ascii_strcasecmp (format, "rggb16"))
++          fourcc = V4L2_PIX_FMT_SRGGB16;
+       }
+     } else if (g_str_equal (mimetype, "video/x-sonix")) {
+       fourcc = V4L2_PIX_FMT_SN9C10X;
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-Adding-support-for-bayer-formats-with-IR-component.patch b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-Adding-support-for-bayer-formats-with-IR-component.patch
new file mode 100644
index 00000000..4e3f2c64
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-Adding-support-for-bayer-formats-with-IR-component.patch
@@ -0,0 +1,121 @@ 
+From b495c8a8a2b4c5676d27a0a898d58ca83ba36a87 Mon Sep 17 00:00:00 2001
+From: Rahul T R <r-ravikumar@ti.com>
+Date: Mon, 4 Jul 2022 15:17:21 +0530
+Subject: [PATCH] Adding support for bayer formats with IR component
+
+Add support for bayer formats with IR component.
+this is required for cameras like ov2312 which
+captures both RGB and IR
+
+Signed-off-by: Rahul T R <r-ravikumar@ti.com>
+---
+ sys/v4l2/ext/videodev2.h |  9 +++++++
+ sys/v4l2/gstv4l2object.c | 52 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 61 insertions(+)
+
+diff --git a/sys/v4l2/ext/videodev2.h b/sys/v4l2/ext/videodev2.h
+index dc829f08d..5838bf906 100644
+--- a/sys/v4l2/ext/videodev2.h
++++ b/sys/v4l2/ext/videodev2.h
+@@ -638,6 +638,15 @@ struct v4l2_pix_format {
+ #define V4L2_PIX_FMT_SGBRG16 v4l2_fourcc('G', 'B', '1', '6') /* 16  GBGB.. RGRG.. */
+ #define V4L2_PIX_FMT_SGRBG16 v4l2_fourcc('G', 'R', '1', '6') /* 16  GRGR.. BGBG.. */
+ #define V4L2_PIX_FMT_SRGGB16 v4l2_fourcc('R', 'G', '1', '6') /* 16  RGRG.. GBGB.. */
++	/* Bayer formats - with IR component */
++#define V4L2_PIX_FMT_SRGGI10 v4l2_fourcc('R', 'G', 'I', '0') /* 10 RGBG.. GIrGIr.. */
++#define V4L2_PIX_FMT_SGRIG10 v4l2_fourcc('G', 'R', 'I', '0') /* 10 GRGB.. IrGIrG.. */
++#define V4L2_PIX_FMT_SBGGI10 v4l2_fourcc('B', 'G', 'I', '0') /* 10 BGRG.. GIrGIr.. */
++#define V4L2_PIX_FMT_SGBIG10 v4l2_fourcc('G', 'B', 'I', '0') /* 10 GBGR.. IrGIrG.. */
++#define V4L2_PIX_FMT_SGIRG10 v4l2_fourcc('G', 'I', 'R', '0') /* 10 GIrGIr.. RGBG.. */
++#define V4L2_PIX_FMT_SIGGR10 v4l2_fourcc('I', 'G', 'R', '0') /* 10 IrGIrG.. GRGB.. */
++#define V4L2_PIX_FMT_SGIBG10 v4l2_fourcc('G', 'I', 'B', '0') /* 10 GIrGIr.. BGRG.. */
++#define V4L2_PIX_FMT_SIGGB10 v4l2_fourcc('I', 'G', 'B', '0') /* 10 IrGIrG.. GBGR.. */
+
+ /* HSV formats */
+ #define V4L2_PIX_FMT_HSV24 v4l2_fourcc('H', 'S', 'V', '3')
+diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
+index 97d09774b..74a6c5bf6 100644
+--- a/sys/v4l2/gstv4l2object.c
++++ b/sys/v4l2/gstv4l2object.c
+@@ -175,6 +175,16 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = {
+   {V4L2_PIX_FMT_SGRBG16, TRUE, GST_V4L2_RAW},
+   {V4L2_PIX_FMT_SRGGB16, TRUE, GST_V4L2_RAW},
+
++  /* Bayer formats - with IR component */
++  {V4L2_PIX_FMT_SRGGI10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGRIG10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SBGGI10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGBIG10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGIRG10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SIGGR10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SGIBG10, TRUE, GST_V4L2_RAW},
++  {V4L2_PIX_FMT_SIGGB10, TRUE, GST_V4L2_RAW},
++
+   /* compressed formats */
+   {V4L2_PIX_FMT_MJPEG, FALSE, GST_V4L2_CODEC},
+   {V4L2_PIX_FMT_JPEG, FALSE, GST_V4L2_CODEC},
+@@ -1129,6 +1139,14 @@ gst_v4l2_object_format_get_rank (const struct v4l2_fmtdesc *fmt)
+     case V4L2_PIX_FMT_SGBRG16:
+     case V4L2_PIX_FMT_SGRBG16:
+     case V4L2_PIX_FMT_SRGGB16:
++    case V4L2_PIX_FMT_SRGGI10:
++    case V4L2_PIX_FMT_SGRIG10:
++    case V4L2_PIX_FMT_SBGGI10:
++    case V4L2_PIX_FMT_SGBIG10:
++    case V4L2_PIX_FMT_SGIRG10:
++    case V4L2_PIX_FMT_SIGGR10:
++    case V4L2_PIX_FMT_SGIBG10:
++    case V4L2_PIX_FMT_SIGGB10:
+       rank = BAYER_BASE_RANK;
+       break;
+
+@@ -1577,6 +1595,24 @@ gst_v4l2_object_v4l2fourcc_to_bare_struct (guint32 fourcc)
+           fourcc == V4L2_PIX_FMT_SGRBG16 ? "grbg16" :
+           fourcc == V4L2_PIX_FMT_SRGGB16 ? "rggb16" : "rggb16", NULL);
+       break;
++    case V4L2_PIX_FMT_SRGGI10:
++    case V4L2_PIX_FMT_SGRIG10:
++    case V4L2_PIX_FMT_SBGGI10:
++    case V4L2_PIX_FMT_SGBIG10:
++    case V4L2_PIX_FMT_SGIRG10:
++    case V4L2_PIX_FMT_SIGGR10:
++    case V4L2_PIX_FMT_SGIBG10:
++    case V4L2_PIX_FMT_SIGGB10:
++      structure = gst_structure_new ("video/x-bayer", "format", G_TYPE_STRING,
++          fourcc == V4L2_PIX_FMT_SGRIG10 ? "grig10" :
++          fourcc == V4L2_PIX_FMT_SBGGI10 ? "bggi10" :
++          fourcc == V4L2_PIX_FMT_SGBIG10 ? "gbig10" :
++          fourcc == V4L2_PIX_FMT_SGIRG10 ? "girg10" :
++          fourcc == V4L2_PIX_FMT_SIGGR10 ? "iggr10" :
++          fourcc == V4L2_PIX_FMT_SGIBG10 ? "gibg10" :
++          fourcc == V4L2_PIX_FMT_SIGGB10 ? "iggb10" :
++          fourcc == V4L2_PIX_FMT_SRGGI10 ? "rggi10" : "bggi10", NULL);
++      break;
+     case V4L2_PIX_FMT_SN9C10X:
+       structure = gst_structure_new_empty ("video/x-sonix");
+       break;
+@@ -1921,6 +1957,22 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps,
+           fourcc = V4L2_PIX_FMT_SGRBG16;
+         else if (!g_ascii_strcasecmp (format, "rggb16"))
+           fourcc = V4L2_PIX_FMT_SRGGB16;
++        else if (!g_ascii_strcasecmp (format, "rggi10"))
++          fourcc = V4L2_PIX_FMT_SRGGI10;
++        else if (!g_ascii_strcasecmp (format, "grig10"))
++          fourcc = V4L2_PIX_FMT_SGRIG10;
++        else if (!g_ascii_strcasecmp (format, "bggi10"))
++          fourcc = V4L2_PIX_FMT_SBGGI10;
++        else if (!g_ascii_strcasecmp (format, "gbig10"))
++          fourcc = V4L2_PIX_FMT_SGBIG10;
++        else if (!g_ascii_strcasecmp (format, "girg10"))
++          fourcc = V4L2_PIX_FMT_SGIRG10;
++        else if (!g_ascii_strcasecmp (format, "iggr10"))
++          fourcc = V4L2_PIX_FMT_SIGGR10;
++        else if (!g_ascii_strcasecmp (format, "gibg10"))
++          fourcc = V4L2_PIX_FMT_SGIBG10;
++        else if (!g_ascii_strcasecmp (format, "iggb10"))
++          fourcc = V4L2_PIX_FMT_SIGGB10;
+       }
+     } else if (g_str_equal (mimetype, "video/x-sonix")) {
+       fourcc = V4L2_PIX_FMT_SN9C10X;
+--
+2.37.0
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.%.bbappend
index 1c4c8515..a36c9760 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.%.bbappend
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.%.bbappend
@@ -1,5 +1,10 @@ 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
+SRC_URI:append = " \
+    file://0001-Adding-support-for-raw10-raw12-and-raw16-bayer-formats.patch \
+    file://0002-Adding-support-for-bayer-formats-with-IR-component.patch \
+"
+
 SRC_URI:append:j721s2 = " \
     file://0001-v4l2-Changes-for-DMA-Buf-import-j721s2.patch \
     file://0002-v4l2-Give-preference-to-contiguous-format-if-support.patch \