projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 9880552d GKH |
1 | From 68f194e027ecfbbc8d5515bc40787e542eed59e9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Daniel Ritz <daniel.ritz@gmx.ch> | |
| 3 | Date: Sat, 12 Dec 2009 14:57:17 -0300 | |
| 4 | Subject: V4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras | |
| 5 | ||
| 6 | From: Daniel Ritz <daniel.ritz@gmx.ch> | |
| 7 | ||
| 8 | commit 68f194e027ecfbbc8d5515bc40787e542eed59e9 upstream. | |
| 9 | ||
| 10 | For some unknown reason, on a MacBookPro5,3 the iSight sometimes report | |
| 11 | a different video format GUID. This patch add the other (wrong) GUID to | |
| 12 | the format table, making the iSight work always w/o other problems. | |
| 13 | ||
| 14 | What it should report: 32595559-0000-0010-8000-00aa00389b71 | |
| 15 | What it often reports: 32595559-0000-0010-8000-000000389b71 | |
| 16 | ||
| 17 | Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch> | |
| 18 | Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
| 19 | Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> | |
| 20 | Cc: Leann Ogasawara <leann.ogasawara@canonical.com> | |
| 21 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 22 | ||
| 23 | --- | |
| 24 | drivers/media/video/uvc/uvc_driver.c | 5 +++++ | |
| 25 | drivers/media/video/uvc/uvcvideo.h | 3 +++ | |
| 26 | 2 files changed, 8 insertions(+) | |
| 27 | ||
| 28 | --- a/drivers/media/video/uvc/uvc_driver.c | |
| 29 | +++ b/drivers/media/video/uvc/uvc_driver.c | |
| 30 | @@ -58,6 +58,11 @@ static struct uvc_format_desc uvc_fmts[] | |
| 31 | .fcc = V4L2_PIX_FMT_YUYV, | |
| 32 | }, | |
| 33 | { | |
| 34 | + .name = "YUV 4:2:2 (YUYV)", | |
| 35 | + .guid = UVC_GUID_FORMAT_YUY2_ISIGHT, | |
| 36 | + .fcc = V4L2_PIX_FMT_YUYV, | |
| 37 | + }, | |
| 38 | + { | |
| 39 | .name = "YUV 4:2:0 (NV12)", | |
| 40 | .guid = UVC_GUID_FORMAT_NV12, | |
| 41 | .fcc = V4L2_PIX_FMT_NV12, | |
| 42 | --- a/drivers/media/video/uvc/uvcvideo.h | |
| 43 | +++ b/drivers/media/video/uvc/uvcvideo.h | |
| 44 | @@ -112,6 +112,9 @@ struct uvc_xu_control { | |
| 45 | #define UVC_GUID_FORMAT_YUY2 \ | |
| 46 | { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ | |
| 47 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | |
| 48 | +#define UVC_GUID_FORMAT_YUY2_ISIGHT \ | |
| 49 | + { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ | |
| 50 | + 0x80, 0x00, 0x00, 0x00, 0x00, 0x38, 0x9b, 0x71} | |
| 51 | #define UVC_GUID_FORMAT_NV12 \ | |
| 52 | { 'N', 'V', '1', '2', 0x00, 0x00, 0x10, 0x00, \ | |
| 53 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} |