lkml.org 
[lkml]   [2010]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[182/205] V4L/DVB: uvcvideo: Add support for V4L2_PIX_FMT_Y16
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

    commit 61421206833a4085d9bdf35b2b84cd9a67dfdfac upstream.

    The Miricle 307K (17dc:0202) camera reports a 16-bit greyscale format,
    support it in the driver.

    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/media/video/uvc/uvc_driver.c | 7 ++++++-
    drivers/media/video/uvc/uvcvideo.h | 4 +++-
    2 files changed, 9 insertions(+), 2 deletions(-)

    --- a/drivers/media/video/uvc/uvc_driver.c
    +++ b/drivers/media/video/uvc/uvc_driver.c
    @@ -91,11 +91,16 @@ static struct uvc_format_desc uvc_fmts[]
    .fcc = V4L2_PIX_FMT_UYVY,
    },
    {
    - .name = "Greyscale",
    + .name = "Greyscale (8-bit)",
    .guid = UVC_GUID_FORMAT_Y800,
    .fcc = V4L2_PIX_FMT_GREY,
    },
    {
    + .name = "Greyscale (16-bit)",
    + .guid = UVC_GUID_FORMAT_Y16,
    + .fcc = V4L2_PIX_FMT_Y16,
    + },
    + {
    .name = "RGB Bayer",
    .guid = UVC_GUID_FORMAT_BY8,
    .fcc = V4L2_PIX_FMT_SBGGR8,
    --- a/drivers/media/video/uvc/uvcvideo.h
    +++ b/drivers/media/video/uvc/uvcvideo.h
    @@ -131,11 +131,13 @@ struct uvc_xu_control {
    #define UVC_GUID_FORMAT_Y800 \
    { 'Y', '8', '0', '0', 0x00, 0x00, 0x10, 0x00, \
    0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
    +#define UVC_GUID_FORMAT_Y16 \
    + { 'Y', '1', '6', ' ', 0x00, 0x00, 0x10, 0x00, \
    + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
    #define UVC_GUID_FORMAT_BY8 \
    { 'B', 'Y', '8', ' ', 0x00, 0x00, 0x10, 0x00, \
    0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}

    -
    /* ------------------------------------------------------------------------
    * Driver specific constants.
    */



    \
     
     \ /
      Last update: 2010-07-30 20:11    [W:0.037 / U:0.612 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site