diff options
-rw-r--r-- | drivers/media/video/uvc/uvc_driver.c | 5 | ||||
-rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index c0e4fbd8f894..fc7db17afb29 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
@@ -60,6 +60,11 @@ static struct uvc_format_desc uvc_fmts[] = { | |||
60 | .fcc = V4L2_PIX_FMT_YUYV, | 60 | .fcc = V4L2_PIX_FMT_YUYV, |
61 | }, | 61 | }, |
62 | { | 62 | { |
63 | .name = "YUV 4:2:2 (YUYV)", | ||
64 | .guid = UVC_GUID_FORMAT_YUY2_ISIGHT, | ||
65 | .fcc = V4L2_PIX_FMT_YUYV, | ||
66 | }, | ||
67 | { | ||
63 | .name = "YUV 4:2:0 (NV12)", | 68 | .name = "YUV 4:2:0 (NV12)", |
64 | .guid = UVC_GUID_FORMAT_NV12, | 69 | .guid = UVC_GUID_FORMAT_NV12, |
65 | .fcc = V4L2_PIX_FMT_NV12, | 70 | .fcc = V4L2_PIX_FMT_NV12, |
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index adcba31008be..6aa9b2c2b685 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h | |||
@@ -113,6 +113,9 @@ struct uvc_xu_control { | |||
113 | #define UVC_GUID_FORMAT_YUY2 \ | 113 | #define UVC_GUID_FORMAT_YUY2 \ |
114 | { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ | 114 | { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ |
115 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | 115 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |
116 | #define UVC_GUID_FORMAT_YUY2_ISIGHT \ | ||
117 | { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ | ||
118 | 0x80, 0x00, 0x00, 0x00, 0x00, 0x38, 0x9b, 0x71} | ||
116 | #define UVC_GUID_FORMAT_NV12 \ | 119 | #define UVC_GUID_FORMAT_NV12 \ |
117 | { 'N', 'V', '1', '2', 0x00, 0x00, 0x10, 0x00, \ | 120 | { 'N', 'V', '1', '2', 0x00, 0x00, 0x10, 0x00, \ |
118 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | 121 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |