You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
169 lines
6.6 KiB
169 lines
6.6 KiB
From 5c4ddf193c07013c5b93759f799943561c5f355b Mon Sep 17 00:00:00 2001
|
|
From: Evgeni <evgeni.raikhel@intel.com>
|
|
Date: Mon, 1 Apr 2019 14:47:28 +0300
|
|
Subject: [PATCH] Streaming formats for Ubuntu 18.04 (Bionic Beaver), Kernel 4.18
|
|
|
|
Signed-off-by: Evgeni Raikhel <evgeni.raikhel@intel.com>
|
|
---
|
|
drivers/media/usb/uvc/uvc_driver.c | 37 ++++++++++++++++++++++++++++
|
|
drivers/media/usb/uvc/uvcvideo.h | 22 +++++++++++++++++
|
|
drivers/media/v4l2-core/v4l2-ioctl.c | 4 ++-
|
|
include/uapi/linux/videodev2.h | 3 +++
|
|
4 files changed, 65 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
|
|
index 8e1382013..6f1dd1a9e 100644
|
|
--- a/drivers/media/usb/uvc/uvc_driver.c
|
|
+++ b/drivers/media/usb/uvc/uvc_driver.c
|
|
@@ -209,6 +209,63 @@ static struct uvc_format_desc uvc_fmts[] = {
|
|
.guid = UVC_GUID_FORMAT_INZI,
|
|
.fcc = V4L2_PIX_FMT_INZI,
|
|
},
|
|
+ {
|
|
+ .name = "Luminosity data 8-bit (L8)",
|
|
+ .guid = UVC_GUID_FORMAT_L8,
|
|
+ .fcc = V4L2_PIX_FMT_GREY,
|
|
+ },
|
|
+ {
|
|
+ .name = "Depth data 16-bit (D16)",
|
|
+ .guid = UVC_GUID_FORMAT_D16,
|
|
+ .fcc = V4L2_PIX_FMT_Z16,
|
|
+ },
|
|
+ {
|
|
+ .name = "Packed raw data 10-bit",
|
|
+ .guid = UVC_GUID_FORMAT_W10,
|
|
+ .fcc = V4L2_PIX_FMT_W10,
|
|
+ },
|
|
+ {
|
|
+ .name = "Confidence data (C )",
|
|
+ .guid = UVC_GUID_FORMAT_CONFIDENCE_MAP,
|
|
+ .fcc = V4L2_PIX_FMT_CONFIDENCE_MAP,
|
|
+ },
|
|
+ /* FishEye 8-bit monochrome */
|
|
+ {
|
|
+ .name = "Raw data 8-bit (RAW8)",
|
|
+ .guid = UVC_GUID_FORMAT_RAW8,
|
|
+ .fcc = V4L2_PIX_FMT_GREY,
|
|
+ },
|
|
+ /* Legacy formats for backward-compatibility*/
|
|
+ {
|
|
+ .name = "Raw data 16-bit (RW16)",
|
|
+ .guid = UVC_GUID_FORMAT_RW16,
|
|
+ .fcc = V4L2_PIX_FMT_RW16,
|
|
+ },
|
|
+ {
|
|
+ .name = "16-bit Bayer BGBG/GRGR",
|
|
+ .guid = UVC_GUID_FORMAT_BAYER16,
|
|
+ .fcc = V4L2_PIX_FMT_SBGGR16,
|
|
+ },
|
|
+ {
|
|
+ .name = "Z16 Huffman Compression",
|
|
+ .guid = UVC_GUID_FORMAT_Z16H,
|
|
+ .fcc = V4L2_PIX_FMT_Z16H,
|
|
+ },
|
|
+ {
|
|
+ .name = "Frame Grabber (FG )",
|
|
+ .guid = UVC_GUID_FORMAT_FG,
|
|
+ .fcc = V4L2_PIX_FMT_FG,
|
|
+ },
|
|
+ {
|
|
+ .name = "SR300 Depth/Confidence (INZC)",
|
|
+ .guid = UVC_GUID_FORMAT_INZC,
|
|
+ .fcc = V4L2_PIX_FMT_INZC,
|
|
+ },
|
|
+ {
|
|
+ .name = "Relative IR (PAIR)",
|
|
+ .guid = UVC_GUID_FORMAT_PAIR,
|
|
+ .fcc = V4L2_PIX_FMT_PAIR,
|
|
+ },
|
|
};
|
|
|
|
/* ------------------------------------------------------------------------
|
|
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
|
|
index be5cf1792..f405e5fe6 100644
|
|
--- a/drivers/media/usb/uvc/uvcvideo.h
|
|
+++ b/drivers/media/usb/uvc/uvcvideo.h
|
|
@@ -158,6 +158,40 @@
|
|
{0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, \
|
|
0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
|
|
|
|
+ #define UVC_GUID_FORMAT_L8 \
|
|
+ { '2', 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, \
|
|
+ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
|
|
+ #define UVC_GUID_FORMAT_D16 \
|
|
+ { 'P', 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, \
|
|
+ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
|
|
+ #define UVC_GUID_FORMAT_W10 \
|
|
+ { 'W', '1', '0', ' ', 0x00, 0x00, 0x10, 0x00, \
|
|
+ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
|
|
+ #define UVC_GUID_FORMAT_RAW8 \
|
|
+ { 'R', 'A', 'W', '8', 0x66, 0x1a, 0x42, 0xa2, \
|
|
+ 0x90, 0x65, 0xd0, 0x18, 0x14, 0xa8, 0xef, 0x8a}
|
|
+ #define UVC_GUID_FORMAT_CONFIDENCE_MAP \
|
|
+ { 'C', ' ', ' ', ' ', 0x00, 0x00, 0x10, 0x00, \
|
|
+ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
|
|
+ /* Legacy formats */
|
|
+ #define UVC_GUID_FORMAT_RW16 \
|
|
+ { 'R', 'W', '1', '6', 0x00, 0x00, 0x10, 0x00, \
|
|
+ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
|
|
+ #define UVC_GUID_FORMAT_BAYER16 \
|
|
+ { 'R', 'W', '1', '6', 0x66, 0x1a, 0x42, 0xa2, \
|
|
+ 0x90, 0x65, 0xd0, 0x18, 0x14, 0xa8, 0xef, 0x8a}
|
|
+ #define UVC_GUID_FORMAT_Z16H \
|
|
+ { 'Z', '1', '6', 'H', 0x00, 0x00, 0x10, 0x00, \
|
|
+ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
|
|
+ #define UVC_GUID_FORMAT_FG \
|
|
+ { 'F', 'G', ' ', ' ', 0x00, 0x00, 0x10, 0x00, \
|
|
+ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
|
|
+ #define UVC_GUID_FORMAT_INZC \
|
|
+ { 'I', 'N', 'Z', 'C', 0x02, 0xb6, 0x0f, 0x48, \
|
|
+ 0x97, 0x8c, 0xe4, 0xe8, 0x8a, 0xe8, 0x9b, 0x89}
|
|
+ #define UVC_GUID_FORMAT_PAIR \
|
|
+ { 'P', 'A', 'I', 'R', 0x36, 0x85, 0x41, 0x48, \
|
|
+ 0xb6, 0xbf, 0x8f, 0xc6, 0xff, 0xb0, 0x83, 0xa8}
|
|
|
|
/* ------------------------------------------------------------------------
|
|
* Driver specific constants.
|
|
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
index dd2100671..050123ae5 100644
|
|
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
@@ -1251,7 +1251,14 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
|
|
case V4L2_META_FMT_VSP1_HGO: descr = "R-Car VSP1 1-D Histogram"; break;
|
|
case V4L2_META_FMT_VSP1_HGT: descr = "R-Car VSP1 2-D Histogram"; break;
|
|
case V4L2_META_FMT_UVC: descr = "UVC payload header metadata"; break;
|
|
-
|
|
+ /* Librealsense formats*/
|
|
+ case V4L2_PIX_FMT_RW16: descr = "16-bit Raw data"; break;
|
|
+ case V4L2_PIX_FMT_W10: descr = "10-bit packed 8888[2222]"; break;
|
|
+ case V4L2_PIX_FMT_CONFIDENCE_MAP: descr = "4-bit per pixel packed"; break;
|
|
+ case V4L2_PIX_FMT_FG: descr = "Frame Grabber (FG )"; break;
|
|
+ case V4L2_PIX_FMT_INZC: descr = "Planar Depth/Confidence (INZC)"; break;
|
|
+ case V4L2_PIX_FMT_PAIR: descr = "Relative IR (PAIR)"; break;
|
|
+ case V4L2_PIX_FMT_Z16H: descr = "Z16 Huffman Compression"; break;
|
|
default:
|
|
/* Compressed formats */
|
|
flags = V4L2_FMT_FLAG_COMPRESSED;
|
|
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
|
|
index 082dc1439..0bbea2885 100644
|
|
--- a/include/uapi/linux/videodev2.h
|
|
+++ b/include/uapi/linux/videodev2.h
|
|
@@ -680,6 +680,14 @@ struct v4l2_pix_format {
|
|
#define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */
|
|
#define V4L2_PIX_FMT_MT21C v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode */
|
|
#define V4L2_PIX_FMT_INZI v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */
|
|
+#define V4L2_PIX_FMT_RW16 v4l2_fourcc('R', 'W', '1', '6') /* Raw data 16-bit */
|
|
+#define V4L2_PIX_FMT_W10 v4l2_fourcc('W', '1', '0', ' ') /* Packed raw data 10-bit */
|
|
+#define V4L2_PIX_FMT_CONFIDENCE_MAP v4l2_fourcc('C', ' ', ' ', ' ') /* Two pixels in one byte */
|
|
+/* Librealsense development*/
|
|
+#define V4L2_PIX_FMT_FG v4l2_fourcc('F', 'G', ' ', ' ') /* Frame Grabber */
|
|
+#define V4L2_PIX_FMT_INZC v4l2_fourcc('I', 'N', 'Z', 'C') /* Planar Depth/Confidence */
|
|
+#define V4L2_PIX_FMT_PAIR v4l2_fourcc('P', 'A', 'I', 'R') /* Relative IR */
|
|
+#define V4L2_PIX_FMT_Z16H v4l2_fourcc('Z', '1', '6', 'H') /* Depth Z16 custom Huffman Code compression*/
|
|
|
|
/* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */
|
|
#define V4L2_PIX_FMT_IPU3_SBGGR10 v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */
|
|
--
|
|
2.17.1
|
|
|