mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
74 lines
3.5 KiB
Diff
74 lines
3.5 KiB
Diff
|
From 9abab2e8e5cfbeae6e1b33cc3a5ed773e4e31774 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Naushir Patuck <naush@raspberrypi.com>
|
||
|
|
Date: Thu, 16 Nov 2023 14:25:39 +0000
|
||
|
|
Subject: [PATCH] include: uapi: v4l2: Add additional pixel formats for use
|
||
|
|
with PiSP
|
||
|
|
|
||
|
|
Add the following formats:
|
||
|
|
|
||
|
|
- V4L2_PIX_FMT_RGB48/V4L2_PIX_FMT_BGR48
|
||
|
|
48-bit RGB where each colour sample is 16-bits.
|
||
|
|
|
||
|
|
- V4L2_PIX_FMT_PISP_COMP1_MONO/V4L2_PIX_FMT_PISP_COMP2_MONO
|
||
|
|
16-bit to 8-bit pisp compressed monochrome pixel format.
|
||
|
|
|
||
|
|
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
|
||
|
|
---
|
||
|
|
drivers/media/v4l2-core/v4l2-ioctl.c | 8 ++++++--
|
||
|
|
include/uapi/linux/videodev2.h | 6 ++++++
|
||
|
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
|
||
|
|
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
|
||
|
|
@@ -1304,6 +1304,8 @@ static void v4l_fill_fmtdesc(struct v4l2
|
||
|
|
case V4L2_PIX_FMT_BGRX32: descr = "32-bit XBGR 8-8-8-8"; break;
|
||
|
|
case V4L2_PIX_FMT_RGBA32: descr = "32-bit RGBA 8-8-8-8"; break;
|
||
|
|
case V4L2_PIX_FMT_RGBX32: descr = "32-bit RGBX 8-8-8-8"; break;
|
||
|
|
+ case V4L2_PIX_FMT_BGR48: descr = "48-bit BGR 16-16-16"; break;
|
||
|
|
+ case V4L2_PIX_FMT_RGB48: descr = "48-bit RGB 16-16-16"; break;
|
||
|
|
case V4L2_PIX_FMT_GREY: descr = "8-bit Greyscale"; break;
|
||
|
|
case V4L2_PIX_FMT_Y4: descr = "4-bit Greyscale"; break;
|
||
|
|
case V4L2_PIX_FMT_Y6: descr = "6-bit Greyscale"; break;
|
||
|
|
@@ -1510,11 +1512,13 @@ static void v4l_fill_fmtdesc(struct v4l2
|
||
|
|
case V4L2_PIX_FMT_PISP_COMP1_RGGB:
|
||
|
|
case V4L2_PIX_FMT_PISP_COMP1_GRBG:
|
||
|
|
case V4L2_PIX_FMT_PISP_COMP1_GBRG:
|
||
|
|
- case V4L2_PIX_FMT_PISP_COMP1_BGGR: descr = "PiSP Bayer Comp 1"; break;
|
||
|
|
+ case V4L2_PIX_FMT_PISP_COMP1_BGGR:
|
||
|
|
+ case V4L2_PIX_FMT_PISP_COMP1_MONO: descr = "PiSP Bayer Comp 1"; break;
|
||
|
|
case V4L2_PIX_FMT_PISP_COMP2_RGGB:
|
||
|
|
case V4L2_PIX_FMT_PISP_COMP2_GRBG:
|
||
|
|
case V4L2_PIX_FMT_PISP_COMP2_GBRG:
|
||
|
|
- case V4L2_PIX_FMT_PISP_COMP2_BGGR: descr = "PiSP Bayer Comp 2"; break;
|
||
|
|
+ case V4L2_PIX_FMT_PISP_COMP2_BGGR:
|
||
|
|
+ case V4L2_PIX_FMT_PISP_COMP2_MONO: descr = "PiSP Bayer Comp 2"; break;
|
||
|
|
default:
|
||
|
|
if (fmt->description[0])
|
||
|
|
return;
|
||
|
|
--- a/include/uapi/linux/videodev2.h
|
||
|
|
+++ b/include/uapi/linux/videodev2.h
|
||
|
|
@@ -582,6 +582,10 @@ struct v4l2_pix_format {
|
||
|
|
#define V4L2_PIX_FMT_ARGB32 v4l2_fourcc('B', 'A', '2', '4') /* 32 ARGB-8-8-8-8 */
|
||
|
|
#define V4L2_PIX_FMT_XRGB32 v4l2_fourcc('B', 'X', '2', '4') /* 32 XRGB-8-8-8-8 */
|
||
|
|
|
||
|
|
+/* RGB formats (6 bytes per pixel) */
|
||
|
|
+#define V4L2_PIX_FMT_BGR48 v4l2_fourcc('B', 'G', 'R', '6') /* 16 BGR-16-16-16 */
|
||
|
|
+#define V4L2_PIX_FMT_RGB48 v4l2_fourcc('R', 'G', 'B', '6') /* 16 RGB-16-16-16 */
|
||
|
|
+
|
||
|
|
/* Grey formats */
|
||
|
|
#define V4L2_PIX_FMT_GREY v4l2_fourcc('G', 'R', 'E', 'Y') /* 8 Greyscale */
|
||
|
|
#define V4L2_PIX_FMT_Y4 v4l2_fourcc('Y', '0', '4', ' ') /* 4 Greyscale */
|
||
|
|
@@ -799,10 +803,12 @@ struct v4l2_pix_format {
|
||
|
|
#define V4L2_PIX_FMT_PISP_COMP1_GRBG v4l2_fourcc('P', 'C', '1', 'G')
|
||
|
|
#define V4L2_PIX_FMT_PISP_COMP1_GBRG v4l2_fourcc('P', 'C', '1', 'g')
|
||
|
|
#define V4L2_PIX_FMT_PISP_COMP1_BGGR v4l2_fourcc('P', 'C', '1', 'B')
|
||
|
|
+#define V4L2_PIX_FMT_PISP_COMP1_MONO v4l2_fourcc('P', 'C', '1', 'M')
|
||
|
|
#define V4L2_PIX_FMT_PISP_COMP2_RGGB v4l2_fourcc('P', 'C', '2', 'R')
|
||
|
|
#define V4L2_PIX_FMT_PISP_COMP2_GRBG v4l2_fourcc('P', 'C', '2', 'G')
|
||
|
|
#define V4L2_PIX_FMT_PISP_COMP2_GBRG v4l2_fourcc('P', 'C', '2', 'g')
|
||
|
|
#define V4L2_PIX_FMT_PISP_COMP2_BGGR v4l2_fourcc('P', 'C', '2', 'B')
|
||
|
|
+#define V4L2_PIX_FMT_PISP_COMP2_MONO v4l2_fourcc('P', 'C', '2', 'M')
|
||
|
|
|
||
|
|
/* SDR formats - used only for Software Defined Radio devices */
|
||
|
|
#define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
|