projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 9880552d GKH |
1 | From 61421206833a4085d9bdf35b2b84cd9a67dfdfac Mon Sep 17 00:00:00 2001 |
| 2 | From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
| 3 | Date: Mon, 12 Apr 2010 10:41:22 -0300 | |
| 4 | Subject: V4L/DVB: uvcvideo: Add support for V4L2_PIX_FMT_Y16 | |
| 5 | ||
| 6 | From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
| 7 | ||
| 8 | commit 61421206833a4085d9bdf35b2b84cd9a67dfdfac upstream. | |
| 9 | ||
| 10 | The Miricle 307K (17dc:0202) camera reports a 16-bit greyscale format, | |
| 11 | support it in the driver. | |
| 12 | ||
| 13 | Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
| 14 | Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> | |
| 15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 16 | ||
| 17 | --- | |
| 18 | drivers/media/video/uvc/uvc_driver.c | 7 ++++++- | |
| 19 | drivers/media/video/uvc/uvcvideo.h | 4 +++- | |
| 20 | 2 files changed, 9 insertions(+), 2 deletions(-) | |
| 21 | ||
| 22 | --- a/drivers/media/video/uvc/uvc_driver.c | |
| 23 | +++ b/drivers/media/video/uvc/uvc_driver.c | |
| 24 | @@ -83,11 +83,16 @@ static struct uvc_format_desc uvc_fmts[] | |
| 25 | .fcc = V4L2_PIX_FMT_UYVY, | |
| 26 | }, | |
| 27 | { | |
| 28 | - .name = "Greyscale", | |
| 29 | + .name = "Greyscale (8-bit)", | |
| 30 | .guid = UVC_GUID_FORMAT_Y800, | |
| 31 | .fcc = V4L2_PIX_FMT_GREY, | |
| 32 | }, | |
| 33 | { | |
| 34 | + .name = "Greyscale (16-bit)", | |
| 35 | + .guid = UVC_GUID_FORMAT_Y16, | |
| 36 | + .fcc = V4L2_PIX_FMT_Y16, | |
| 37 | + }, | |
| 38 | + { | |
| 39 | .name = "RGB Bayer", | |
| 40 | .guid = UVC_GUID_FORMAT_BY8, | |
| 41 | .fcc = V4L2_PIX_FMT_SBGGR8, | |
| 42 | --- a/drivers/media/video/uvc/uvcvideo.h | |
| 43 | +++ b/drivers/media/video/uvc/uvcvideo.h | |
| 44 | @@ -127,11 +127,13 @@ struct uvc_xu_control { | |
| 45 | #define UVC_GUID_FORMAT_Y800 \ | |
| 46 | { 'Y', '8', '0', '0', 0x00, 0x00, 0x10, 0x00, \ | |
| 47 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | |
| 48 | +#define UVC_GUID_FORMAT_Y16 \ | |
| 49 | + { 'Y', '1', '6', ' ', 0x00, 0x00, 0x10, 0x00, \ | |
| 50 | + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | |
| 51 | #define UVC_GUID_FORMAT_BY8 \ | |
| 52 | { 'B', 'Y', '8', ' ', 0x00, 0x00, 0x10, 0x00, \ | |
| 53 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | |
| 54 | ||
| 55 | - | |
| 56 | /* ------------------------------------------------------------------------ | |
| 57 | * Driver specific constants. | |
| 58 | */ |