From patchwork Mon Jan 20 08:11:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edgar Thier X-Patchwork-Id: 21653 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1W59xH-00062x-10; Mon, 20 Jan 2014 09:11:35 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1W59xE-00033X-2B; Mon, 20 Jan 2014 09:11:34 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752385AbaATILa (ORCPT + 1 other); Mon, 20 Jan 2014 03:11:30 -0500 Received: from mail-wi0-f175.google.com ([209.85.212.175]:47658 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750942AbaATIL3 (ORCPT ); Mon, 20 Jan 2014 03:11:29 -0500 Received: by mail-wi0-f175.google.com with SMTP id hr1so2859033wib.8 for ; Mon, 20 Jan 2014 00:11:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:content-type; bh=xaXA4Mk6/aaZmecCB1ODZmX1fG5d/rAJjt7rT0ZL/10=; b=KjslB/KrNRPyq4pZSF8mCMHcGf11xVfsz2dWMw+jndAk4L3Kz5a0/U2MFiAOXHeMhh A2XFw0CRVRo/NWNIl4cxC5jb7qth8vWxooLdKu7fpgqAS51f+jVsIPBotJci9515vkDk zqwE2DnouTtv9S0YT/ryYphwvE3t3Ym+khplxEA0I8tejaDF5/tD6j01vTp6y0DeSBmn l7PwkVvzT5VU33jAI1wTxPdc6JyygRIsedDGNIa8fWai1A3xXh7nJKwRCAXjXwkAD0MC c5VM/HGsMiGXudr/TcS/F5/+C12/ZjV7q9VmA/lwKqxfa9fbmFongbr0Tktp754n5hYg zNvA== MIME-Version: 1.0 X-Received: by 10.194.201.65 with SMTP id jy1mr12812597wjc.43.1390205488403; Mon, 20 Jan 2014 00:11:28 -0800 (PST) Received: by 10.194.109.227 with HTTP; Mon, 20 Jan 2014 00:11:28 -0800 (PST) Date: Mon, 20 Jan 2014 09:11:28 +0100 X-Google-Sender-Auth: 4bhpmJ2sC-cn1FOBvRymVv4TmjM Message-ID: Subject: [PATCH] Added bayer 8-bit patterns to uvcvideo From: Edgar Thier To: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.1.20.80315 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Add bayer 8-bit GUIDs to uvcvideo and associate them with the corresponding V4L2 pixel formats. Signed-off-by: Edgar Thier Acked-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_driver.c | 22 +++++++++++++++++++++- drivers/media/usb/uvc/uvcvideo.h | 12 ++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index c3bb250..84da426 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -108,11 +108,31 @@ static struct uvc_format_desc uvc_fmts[] = { .fcc = V4L2_PIX_FMT_Y16, }, { - .name = "RGB Bayer", + .name = "RGB Bayer (bggr)", .guid = UVC_GUID_FORMAT_BY8, .fcc = V4L2_PIX_FMT_SBGGR8, }, { + .name = "RGB Bayer (bggr)", + .guid = UVC_GUID_FORMAT_BY8_BA81, + .fcc = V4L2_PIX_FMT_SBGGR8, + }, + { + .name = "RGB Bayer (grbg)", + .guid = UVC_GUID_FORMAT_BY8_GRBG, + .fcc = V4L2_PIX_FMT_SGRBG8, + }, + { + .name = "RGB Bayer (gbrg)", + .guid = UVC_GUID_FORMAT_BY8_GBRG, + .fcc = V4L2_PIX_FMT_SGBRG8, + }, + { + .name = "RGB Bayer (rggb)", + .guid = UVC_GUID_FORMAT_BY8_RGGB, + .fcc = V4L2_PIX_FMT_SRGGB8, + }, + { .name = "RGB565", .guid = UVC_GUID_FORMAT_RGBP, .fcc = V4L2_PIX_FMT_RGB565, diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 9e35982..57357d9 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -94,6 +94,18 @@ #define UVC_GUID_FORMAT_BY8 \ { 'B', 'Y', '8', ' ', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_BY8_BA81 \ + { 'B', 'A', '8', '1', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_BY8_GRBG \ + { 'G', 'R', 'B', 'G', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_BY8_GBRG \ + { 'G', 'B', 'R', 'G', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_BY8_RGGB \ + { 'R', 'G', 'G', 'B', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} #define UVC_GUID_FORMAT_RGBP \ { 'R', 'G', 'B', 'P', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}