History

Revert "[media] UVC: Add support for ds4 depth camera"

This reverts commit 120c41d3477a23c6941059401db63677736f1935. The patch doesn't add the corresponding documentation bits to the media infrastructure uAPI DocBook. Also, they're for 3D formats, with requre further discussions.

Mauro Carvalho Chehab committed 10 years ago

Commit 52d60eb1 parent 991ce923 files · +0 −35Browse files

Unified · Split

3 files
  1. drivers/media/usb/uvc/uvc_driver.c +0 −20
  2. drivers/media/usb/uvc/uvcvideo.h +0 −12
  3. include/uapi/linux/videodev2.h +0 −3
drivers/media/usb/uvc/uvc_driver.c+0−20
@@ -148,26 +148,6 @@ static struct uvc_format_desc uvc_fmts[] = { · 147 unmodified lines
148 .guid = UVC_GUID_FORMAT_H264,148 .guid = UVC_GUID_FORMAT_H264,
149 .fcc = V4L2_PIX_FMT_H264,149 .fcc = V4L2_PIX_FMT_H264,
150 },150 },
151 {
152 .name = "Greyscale 8 L/R (Y8I)",
153 .guid = UVC_GUID_FORMAT_Y8I,
154 .fcc = V4L2_PIX_FMT_Y8I,
155 },
156 {
157 .name = "Greyscale 12 L/R (Y12I)",
158 .guid = UVC_GUID_FORMAT_Y12I,
159 .fcc = V4L2_PIX_FMT_Y12I,
160 },
161 {
162 .name = "Depth data 16-bit (Z16)",
163 .guid = UVC_GUID_FORMAT_Z16,
164 .fcc = V4L2_PIX_FMT_Z16,
165 },
166 {
167 .name = "Bayer 10-bit (SRGGB10P)",
168 .guid = UVC_GUID_FORMAT_RW10,
169 .fcc = V4L2_PIX_FMT_SRGGB10P,
170 },
171};151};
172 152
173/* ------------------------------------------------------------------------153/* ------------------------------------------------------------------------
drivers/media/usb/uvc/uvcvideo.h+0−12
@@ -119,18 +119,6 @@ · 118 unmodified lines
119#define UVC_GUID_FORMAT_H264 \119#define UVC_GUID_FORMAT_H264 \
120 { 'H', '2', '6', '4', 0x00, 0x00, 0x10, 0x00, \120 { 'H', '2', '6', '4', 0x00, 0x00, 0x10, 0x00, \
121 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}121 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
122#define UVC_GUID_FORMAT_Y8I \
123 { 'Y', '8', 'I', ' ', 0x00, 0x00, 0x10, 0x00, \
124 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
125#define UVC_GUID_FORMAT_Y12I \
126 { 'Y', '1', '2', 'I', 0x00, 0x00, 0x10, 0x00, \
127 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
128#define UVC_GUID_FORMAT_Z16 \
129 { 'Z', '1', '6', ' ', 0x00, 0x00, 0x10, 0x00, \
130 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
131#define UVC_GUID_FORMAT_RW10 \
132 { 'R', 'W', '1', '0', 0x00, 0x00, 0x10, 0x00, \
133 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
134 122
135/* ------------------------------------------------------------------------123/* ------------------------------------------------------------------------
136 * Driver specific constants.124 * Driver specific constants.
include/uapi/linux/videodev2.h+0−3
@@ -621,9 +621,6 @@ struct v4l2_pix_format { · 620 unmodified lines
621#define V4L2_PIX_FMT_JPGL v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */621#define V4L2_PIX_FMT_JPGL v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */
622#define V4L2_PIX_FMT_SE401 v4l2_fourcc('S', '4', '0', '1') /* se401 janggu compressed rgb */622#define V4L2_PIX_FMT_SE401 v4l2_fourcc('S', '4', '0', '1') /* se401 janggu compressed rgb */
623#define V4L2_PIX_FMT_S5C_UYVY_JPG v4l2_fourcc('S', '5', 'C', 'I') /* S5C73M3 interleaved UYVY/JPEG */623#define V4L2_PIX_FMT_S5C_UYVY_JPG v4l2_fourcc('S', '5', 'C', 'I') /* S5C73M3 interleaved UYVY/JPEG */
624#define V4L2_PIX_FMT_Y8I v4l2_fourcc('Y', '8', 'I', ' ') /* Greyscale 8-bit L/R interleaved */
625#define V4L2_PIX_FMT_Y12I v4l2_fourcc('Y', '1', '2', 'I') /* Greyscale 12-bit L/R interleaved */
626#define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */
627 624
628/* SDR formats - used only for Software Defined Radio devices */625/* SDR formats - used only for Software Defined Radio devices */
629#define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */626#define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t