From 7cdd3c0e68b5530774bcc11ac19f2135c795367f Mon Sep 17 00:00:00 2001 From: Daniel Ritz Date: Sat, 12 Dec 2009 14:57:17 -0300 Subject: [PATCH] --- yaml --- r: 181423 b: refs/heads/master c: 68f194e027ecfbbc8d5515bc40787e542eed59e9 h: refs/heads/master i: 181421: 4c27990576b7b0e80b46a672eb1a2b3232f7b84a 181419: c73a5febe671fa6113545b4a38d06dcfa7998dd4 181415: 1ac2e1a85ffceaf38e09257e1890e12ace27cdc8 181407: d57d8eb1fb05561a74bfae764266ff5dfc163fa5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_driver.c | 5 +++++ trunk/drivers/media/video/uvc/uvcvideo.h | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f183d0bce664..1f131c073a64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73de3592c0da2313b25bac7789e9ea02c4b9f082 +refs/heads/master: 68f194e027ecfbbc8d5515bc40787e542eed59e9 diff --git a/trunk/drivers/media/video/uvc/uvc_driver.c b/trunk/drivers/media/video/uvc/uvc_driver.c index c0e4fbd8f894..fc7db17afb29 100644 --- a/trunk/drivers/media/video/uvc/uvc_driver.c +++ b/trunk/drivers/media/video/uvc/uvc_driver.c @@ -59,6 +59,11 @@ static struct uvc_format_desc uvc_fmts[] = { .guid = UVC_GUID_FORMAT_YUY2, .fcc = V4L2_PIX_FMT_YUYV, }, + { + .name = "YUV 4:2:2 (YUYV)", + .guid = UVC_GUID_FORMAT_YUY2_ISIGHT, + .fcc = V4L2_PIX_FMT_YUYV, + }, { .name = "YUV 4:2:0 (NV12)", .guid = UVC_GUID_FORMAT_NV12, diff --git a/trunk/drivers/media/video/uvc/uvcvideo.h b/trunk/drivers/media/video/uvc/uvcvideo.h index adcba31008be..6aa9b2c2b685 100644 --- a/trunk/drivers/media/video/uvc/uvcvideo.h +++ b/trunk/drivers/media/video/uvc/uvcvideo.h @@ -113,6 +113,9 @@ struct uvc_xu_control { #define UVC_GUID_FORMAT_YUY2 \ { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_YUY2_ISIGHT \ + { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0x00, 0x00, 0x38, 0x9b, 0x71} #define UVC_GUID_FORMAT_NV12 \ { 'N', 'V', '1', '2', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}