From patchwork Fri Jan 23 00:28:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 445 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 23 Jan 2009 04:05:21 +0000 Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1LQDIH-0006Wy-EL for mchehab@infradead.org; Fri, 23 Jan 2009 04:05:21 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754643AbZAWEFU (ORCPT ); Thu, 22 Jan 2009 23:05:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754745AbZAWEFU (ORCPT ); Thu, 22 Jan 2009 23:05:20 -0500 Received: from mail.renesas.com ([202.234.163.13]:49732 "EHLO mail05.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754643AbZAWEFT (ORCPT ); Thu, 22 Jan 2009 23:05:19 -0500 X-AuditID: ac140388-0000000a00006b18-41-497941f855ac Received: from guardian01.idc.renesas.com ([172.20.8.200]) by mail05.idc.renesas.com (sendmail) with ESMTP id n0N45Cc8011529; Fri, 23 Jan 2009 13:05:12 +0900 (JST) Received: (from root@localhost) by guardian01.idc.renesas.com with id n0N45Cem016456; Fri, 23 Jan 2009 13:05:12 +0900 (JST) Received: from mta03.idc.renesas.com (localhost [127.0.0.1]) by mta03.idc.renesas.com with ESMTP id n0N45Dg5006459; Fri, 23 Jan 2009 13:05:13 +0900 (JST) Received: from PG10870.renesas.com ([172.30.8.159]) by ims05.idc.renesas.com (Sendmail) with ESMTPA id <0KDW00C6UOOOMJ@ims05.idc.renesas.com>; Fri, 23 Jan 2009 13:05:12 +0900 (JST) Date: Fri, 23 Jan 2009 09:28:20 +0900 From: Kuninori Morimoto Subject: [PATCH] sh_mobile_ceu_camera: NV12/21/16/61 are added only once. To: Guennadi Liakhovetski Cc: Magnus , Linux Media Message-id: MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-type: text/plain; charset=US-ASCII User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.7 Emacs/22.1 (i386-mingw-nt5.1.2600) MULE/5.0 (SAKAKI) Meadow/3.00-dev (KIKU) X-Brightmail-Tracker: AAAAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org NV12/21/16/61 had been added every time UYVY/VYUY/YUYV/YVYU appears on get_formats. This patch modify this problem. Signed-off-by: Kuninori Morimoto --- [before] Format NV12 (12 bits, NV12): Planar NV12 Format NV21 (12 bits, NV21): Planar NV21 Format unknown (0x3631564e) ( 0 bits, NV16): Unknown 0x3631564e Format unknown (0x3136564e) ( 0 bits, NV61): Unknown 0x3136564e Format YUYV (16 bits, YUYV): Packed YUY2 Format NV12 (12 bits, NV12): Planar NV12 Format NV21 (12 bits, NV21): Planar NV21 Format unknown (0x3631564e) ( 0 bits, NV16): Unknown 0x3631564e Format unknown (0x3136564e) ( 0 bits, NV61): Unknown 0x3136564e Format unknown (0x55595659) ( 0 bits, YVYU): Packed YVYU Format NV12 (12 bits, NV12): Planar NV12 Format NV21 (12 bits, NV21): Planar NV21 Format unknown (0x3631564e) ( 0 bits, NV16): Unknown 0x3631564e Format unknown (0x3136564e) ( 0 bits, NV61): Unknown 0x3136564e Format UYVY (16 bits, UYVY): Packed UYVY Format RGB555 (16 bits, RGB555): BGR 15-bit Format RGB555X (16 bits, RGB555X): Unknown 0x51424752 Format RGB565 (16 bits, RGB565): BGR 16-bit Format RGB565X (16 bits, RGB565X): Unknown 0x52424752 [after] Format NV12 (12 bits, NV12): Planar NV12 Format NV21 (12 bits, NV21): Planar NV21 Format unknown (0x3631564e) ( 0 bits, NV16): Unknown 0x3631564e Format unknown (0x3136564e) ( 0 bits, NV61): Unknown 0x3136564e Format YUYV (16 bits, YUYV): Packed YUY2 Format unknown (0x55595659) ( 0 bits, YVYU): Packed YVYU Format UYVY (16 bits, UYVY): Packed UYVY Format RGB555 (16 bits, RGB555): BGR 15-bit Format RGB555X (16 bits, RGB555X): Unknown 0x51424752 Format RGB565 (16 bits, RGB565): BGR 16-bit Format RGB565X (16 bits, RGB565X): Unknown 0x52424752 drivers/media/video/sh_mobile_ceu_camera.c | 64 ++++++++++++++++------------ 1 files changed, 36 insertions(+), 28 deletions(-) diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 9a2586b..9cde91a 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c @@ -555,42 +555,50 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, int idx, struct soc_camera_format_xlate *xlate) { struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); - int ret, k, n; + int ret, i, k, n; int formats = 0; ret = sh_mobile_ceu_try_bus_param(icd); if (ret < 0) return 0; - switch (icd->formats[idx].fourcc) { - case V4L2_PIX_FMT_UYVY: - case V4L2_PIX_FMT_VYUY: - case V4L2_PIX_FMT_YUYV: - case V4L2_PIX_FMT_YVYU: - n = ARRAY_SIZE(sh_mobile_ceu_formats); - formats += n; - for (k = 0; xlate && k < n; k++) { - xlate->host_fmt = &sh_mobile_ceu_formats[k]; - xlate->cam_fmt = icd->formats + idx; - xlate->buswidth = icd->formats[idx].depth; - xlate++; - dev_dbg(&ici->dev, "Providing format %s using %s\n", - sh_mobile_ceu_formats[k].name, - icd->formats[idx].name); - } - default: - /* Generic pass-through */ - formats++; - if (xlate) { - xlate->host_fmt = icd->formats + idx; - xlate->cam_fmt = icd->formats + idx; - xlate->buswidth = icd->formats[idx].depth; - xlate++; - dev_dbg(&ici->dev, - "Providing format %s in pass-through mode\n", - icd->formats[idx].name); + /* yuv color format check when idx == 0 */ + if (idx) + goto yuv_check_done; + + for (i = 0 ; i < icd->num_formats ; i++) { + switch (icd->formats[i].fourcc) { + case V4L2_PIX_FMT_UYVY: + case V4L2_PIX_FMT_VYUY: + case V4L2_PIX_FMT_YUYV: + case V4L2_PIX_FMT_YVYU: + n = ARRAY_SIZE(sh_mobile_ceu_formats); + formats += n; + for (k = 0; xlate && k < n; k++) { + xlate->host_fmt = &sh_mobile_ceu_formats[k]; + xlate->cam_fmt = icd->formats + i; + xlate->buswidth = icd->formats[i].depth; + xlate++; + dev_dbg(&ici->dev, + "Providing format %s using %s\n", + sh_mobile_ceu_formats[k].name, + icd->formats[i].name); + } + goto yuv_check_done; } } +yuv_check_done: + + formats++; + if (xlate) { + xlate->host_fmt = icd->formats + idx; + xlate->cam_fmt = icd->formats + idx; + xlate->buswidth = icd->formats[idx].depth; + xlate++; + dev_dbg(&ici->dev, + "Providing format %s in pass-through mode\n", + icd->formats[idx].name); + } return formats; }