diff options
author | Edgar Thier <info@edgarthier.net> | 2014-02-20 02:12:51 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-05 14:58:21 -0500 |
commit | e72ed08e66d044ed74c485da68ca809bebf99739 (patch) | |
tree | e55b8cb099d78e22e27b8861aff643b9df9c4d82 | |
parent | b1e43f232698274871e1358c276d7b0242a7d607 (diff) |
[media] uvcvideo: Add bayer 8-bit patterns to uvcvideo
Add bayer 8-bit GUIDs to uvcvideo and associated them with the
corresponding V4L2 pixel formats.
Signed-off-by: Edgar Thier <info@edgarthier.net>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/usb/uvc/uvc_driver.c | 22 | ||||
-rw-r--r-- | drivers/media/usb/uvc/uvcvideo.h | 12 |
2 files changed, 33 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index b6cac17c238e..ad47c5cb539a 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c | |||
@@ -108,11 +108,31 @@ static struct uvc_format_desc uvc_fmts[] = { | |||
108 | .fcc = V4L2_PIX_FMT_Y16, | 108 | .fcc = V4L2_PIX_FMT_Y16, |
109 | }, | 109 | }, |
110 | { | 110 | { |
111 | .name = "RGB Bayer", | 111 | .name = "BGGR Bayer (BY8 )", |
112 | .guid = UVC_GUID_FORMAT_BY8, | 112 | .guid = UVC_GUID_FORMAT_BY8, |
113 | .fcc = V4L2_PIX_FMT_SBGGR8, | 113 | .fcc = V4L2_PIX_FMT_SBGGR8, |
114 | }, | 114 | }, |
115 | { | 115 | { |
116 | .name = "BGGR Bayer (BA81)", | ||
117 | .guid = UVC_GUID_FORMAT_BA81, | ||
118 | .fcc = V4L2_PIX_FMT_SBGGR8, | ||
119 | }, | ||
120 | { | ||
121 | .name = "GBRG Bayer (GBRG)", | ||
122 | .guid = UVC_GUID_FORMAT_GBRG, | ||
123 | .fcc = V4L2_PIX_FMT_SGBRG8, | ||
124 | }, | ||
125 | { | ||
126 | .name = "GRBG Bayer (GRBG)", | ||
127 | .guid = UVC_GUID_FORMAT_GRBG, | ||
128 | .fcc = V4L2_PIX_FMT_SGRBG8, | ||
129 | }, | ||
130 | { | ||
131 | .name = "RGGB Bayer (RGGB)", | ||
132 | .guid = UVC_GUID_FORMAT_RGGB, | ||
133 | .fcc = V4L2_PIX_FMT_SRGGB8, | ||
134 | }, | ||
135 | { | ||
116 | .name = "RGB565", | 136 | .name = "RGB565", |
117 | .guid = UVC_GUID_FORMAT_RGBP, | 137 | .guid = UVC_GUID_FORMAT_RGBP, |
118 | .fcc = V4L2_PIX_FMT_RGB565, | 138 | .fcc = V4L2_PIX_FMT_RGB565, |
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 143d5e51cb96..b1f69a6d4068 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h | |||
@@ -94,6 +94,18 @@ | |||
94 | #define UVC_GUID_FORMAT_BY8 \ | 94 | #define UVC_GUID_FORMAT_BY8 \ |
95 | { 'B', 'Y', '8', ' ', 0x00, 0x00, 0x10, 0x00, \ | 95 | { 'B', 'Y', '8', ' ', 0x00, 0x00, 0x10, 0x00, \ |
96 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | 96 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |
97 | #define UVC_GUID_FORMAT_BA81 \ | ||
98 | { 'B', 'A', '8', '1', 0x00, 0x00, 0x10, 0x00, \ | ||
99 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
100 | #define UVC_GUID_FORMAT_GBRG \ | ||
101 | { 'G', 'B', 'R', 'G', 0x00, 0x00, 0x10, 0x00, \ | ||
102 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
103 | #define UVC_GUID_FORMAT_GRBG \ | ||
104 | { 'G', 'R', 'B', 'G', 0x00, 0x00, 0x10, 0x00, \ | ||
105 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
106 | #define UVC_GUID_FORMAT_RGGB \ | ||
107 | { 'R', 'G', 'G', 'B', 0x00, 0x00, 0x10, 0x00, \ | ||
108 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
97 | #define UVC_GUID_FORMAT_RGBP \ | 109 | #define UVC_GUID_FORMAT_RGBP \ |
98 | { 'R', 'G', 'B', 'P', 0x00, 0x00, 0x10, 0x00, \ | 110 | { 'R', 'G', 'B', 'P', 0x00, 0x00, 0x10, 0x00, \ |
99 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | 111 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |