From patchwork Wed Dec 5 11:49:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1841151 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 36600DF266 for ; Wed, 5 Dec 2012 11:50:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752423Ab2LELu3 (ORCPT ); Wed, 5 Dec 2012 06:50:29 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:55772 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590Ab2LELu2 (ORCPT ); Wed, 5 Dec 2012 06:50:28 -0500 Received: by mail-pb0-f46.google.com with SMTP id wy7so3596394pbc.19 for ; Wed, 05 Dec 2012 03:50:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=ePF8/7nM77bDpWm3d8XQaq5CQ6UoWfy0+5PEV4ODuPs=; b=DvPeoN4UKsoRf/iHuZdlKuCERJlbaFaMB1zLzykUdpEvVIiDGvp/IKG1LarijSxrnW ui/UqI/lXHT38IMHY0K/LT8oA2+KP1aHjAsaHWi7wxQlaqGzBk7/wXMaBKkIobEDemUY wHT0AmoRpkG85Irr8F5Q77jEQ/3IZKFvkUPxKOtT9MuGPQAuHLHa9SxBrJDb+IHqwQVj cyZBHd5UelolWWBVfIsEy/zibNP1NrPviY5HA0UOitBSBsEMep8qR8fkDXGLpYBTzkSt j9NuJc/FJ5Ha0NbyRQvoJsNTUv4PeklllVANRFy273DGmmr/i6+2UfkWf28eOpS8y5rW 5o7w== Received: by 10.68.143.201 with SMTP id sg9mr49069407pbb.32.1354708228246; Wed, 05 Dec 2012 03:50:28 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id na4sm2793617pbc.18.2012.12.05.03.50.23 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Dec 2012 03:50:27 -0800 (PST) From: Prabhakar Lad To: LMML Cc: LKML , LDOC , "Lad, Prabhakar" , Sakari Ailus , Laurent Pinchart , Kyungmin Park , Guennadi Liakhovetski , Sylwester Nawrocki , Hans Verkuil , Hans de Goede , Chris MacGregor , Rob Landley , Jeongtae Park , Mauro Carvalho Chehab Subject: [PATCH RFC v2] media: v4l2-ctrl: Add gain controls Date: Wed, 5 Dec 2012 17:19:29 +0530 Message-Id: <1354708169-1139-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Lad, Prabhakar add support for per color component digital/analog gain controls and also their corresponding offset. Signed-off-by: Lad, Prabhakar Cc: Sakari Ailus Cc: Laurent Pinchart Cc: Kyungmin Park Cc: Guennadi Liakhovetski Cc: Sylwester Nawrocki Cc: Hans Verkuil Cc: Hans de Goede Cc: Chris MacGregor Cc: Rob Landley Cc: Jeongtae Park Cc: Mauro Carvalho Chehab --- Changes for v2: 1: Fixed review comments pointed by Laurent. 2: Rebased on latest tree. Documentation/DocBook/media/v4l/controls.xml | 54 ++++++++++++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 11 +++++ include/uapi/linux/v4l2-controls.h | 11 +++++ 3 files changed, 76 insertions(+), 0 deletions(-) diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 7fe5be1..847a9bb 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml @@ -4543,6 +4543,60 @@ interface and may change in the future. specific test patterns can be used to test if a device is working properly. + + V4L2_CID_GAIN_RED + integer + + + V4L2_CID_GAIN_GREEN_RED + integer + + + V4L2_CID_GAIN_GREEN_BLUE + integer + + + V4L2_CID_GAIN_BLUE + integer + + + V4L2_CID_GAIN_GREEN + integer + + + Some capture/sensor devices have + the capability to set per color component digital/analog gain values. + + + V4L2_CID_GAIN_OFFSET + integer + + + V4L2_CID_BLUE_OFFSET + integer + + + V4L2_CID_RED_OFFSET + integer + + + V4L2_CID_GREEN_OFFSET + integer + + + V4L2_CID_GREEN_RED_OFFSET + integer + + + V4L2_CID_GREEN_BLUE_OFFSET + integer + + + Some capture/sensor devices have the + capability to set per color component digital/analog gain offset values. + V4L2_CID_GAIN_OFFSET is the global gain offset and the rest are per + color component gain offsets. + diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index f6ee201..05e3708 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -790,6 +790,17 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_LINK_FREQ: return "Link Frequency"; case V4L2_CID_PIXEL_RATE: return "Pixel Rate"; case V4L2_CID_TEST_PATTERN: return "Test Pattern"; + case V4L2_CID_GAIN_RED: return "Gain Red"; + case V4L2_CID_GAIN_GREEN_RED: return "Gain Green Red"; + case V4L2_CID_GAIN_GREEN_BLUE: return "Gain Green Blue"; + case V4L2_CID_GAIN_BLUE: return "Gain Blue"; + case V4L2_CID_GAIN_GREEN: return "Gain Green"; + case V4L2_CID_GAIN_OFFSET: return "Gain Offset"; + case V4L2_CID_BLUE_OFFSET: return "Gain Blue Offset"; + case V4L2_CID_RED_OFFSET: return "Gain Red Offset"; + case V4L2_CID_GREEN_OFFSET: return "Gain Green Offset"; + case V4L2_CID_GREEN_RED_OFFSET: return "Gain Green Red Offset"; + case V4L2_CID_GREEN_BLUE_OFFSET: return "Gain Green Blue Offset"; /* DV controls */ case V4L2_CID_DV_CLASS: return "Digital Video Controls"; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index f56c945..9b6b233 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -799,5 +799,16 @@ enum v4l2_jpeg_chroma_subsampling { #define V4L2_CID_LINK_FREQ (V4L2_CID_IMAGE_PROC_CLASS_BASE + 1) #define V4L2_CID_PIXEL_RATE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 2) #define V4L2_CID_TEST_PATTERN (V4L2_CID_IMAGE_PROC_CLASS_BASE + 3) +#define V4L2_CID_GAIN_RED (V4L2_CID_IMAGE_PROC_CLASS_BASE + 4) +#define V4L2_CID_GAIN_GREEN_RED (V4L2_CID_IMAGE_PROC_CLASS_BASE + 5) +#define V4L2_CID_GAIN_GREEN_BLUE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 6) +#define V4L2_CID_GAIN_BLUE (V4L2_CID_IMAGE_PROC_CLASS_BASE + 7) +#define V4L2_CID_GAIN_GREEN (V4L2_CID_IMAGE_PROC_CLASS_BASE + 8) +#define V4L2_CID_GAIN_OFFSET (V4L2_CID_IMAGE_PROC_CLASS_BASE + 9) +#define V4L2_CID_BLUE_OFFSET (V4L2_CID_IMAGE_PROC_CLASS_BASE + 10) +#define V4L2_CID_RED_OFFSET (V4L2_CID_IMAGE_PROC_CLASS_BASE + 11) +#define V4L2_CID_GREEN_OFFSET (V4L2_CID_IMAGE_PROC_CLASS_BASE + 12) +#define V4L2_CID_GREEN_RED_OFFSET (V4L2_CID_IMAGE_PROC_CLASS_BASE + 13) +#define V4L2_CID_GREEN_BLUE_OFFSET (V4L2_CID_IMAGE_PROC_CLASS_BASE + 14) #endif