lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1354708169-1139-1-git-send-email-prabhakar.csengg@gmail.com> Date: Wed, 5 Dec 2012 17:19:29 +0530 From: Prabhakar Lad <prabhakar.csengg@...il.com> To: LMML <linux-media@...r.kernel.org> Cc: LKML <linux-kernel@...r.kernel.org>, LDOC <linux-doc@...r.kernel.org>, "Lad, Prabhakar" <prabhakar.csengg@...il.com>, Sakari Ailus <sakari.ailus@....fi>, Laurent Pinchart <laurent.pinchart@...asonboard.com>, Kyungmin Park <kyungmin.park@...sung.com>, Guennadi Liakhovetski <g.liakhovetski@....de>, Sylwester Nawrocki <s.nawrocki@...sung.com>, Hans Verkuil <hans.verkuil@...co.com>, Hans de Goede <hdegoede@...hat.com>, Chris MacGregor <chris@...ermato.com>, Rob Landley <rob@...dley.net>, Jeongtae Park <jtp.park@...sung.com>, Mauro Carvalho Chehab <mchehab@...radead.org> Subject: [PATCH RFC v2] media: v4l2-ctrl: Add gain controls From: Lad, Prabhakar <prabhakar.csengg@...il.com> add support for per color component digital/analog gain controls and also their corresponding offset. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@...il.com> Cc: Sakari Ailus <sakari.ailus@....fi> Cc: Laurent Pinchart <laurent.pinchart@...asonboard.com> Cc: Kyungmin Park <kyungmin.park@...sung.com> Cc: Guennadi Liakhovetski <g.liakhovetski@....de> Cc: Sylwester Nawrocki <s.nawrocki@...sung.com> Cc: Hans Verkuil <hans.verkuil@...co.com> Cc: Hans de Goede <hdegoede@...hat.com> Cc: Chris MacGregor <chris@...ermato.com> Cc: Rob Landley <rob@...dley.net> Cc: Jeongtae Park <jtp.park@...sung.com> Cc: Mauro Carvalho Chehab <mchehab@...radead.org> --- 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.</para> specific test patterns can be used to test if a device is working properly.</entry> </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GAIN_RED</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GAIN_GREEN_RED</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GAIN_GREEN_BLUE</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GAIN_BLUE</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GAIN_GREEN</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="descr"> Some capture/sensor devices have + the capability to set per color component digital/analog gain values.</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GAIN_OFFSET</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_BLUE_OFFSET</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_RED_OFFSET</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GREEN_OFFSET</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GREEN_RED_OFFSET</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="id"><constant>V4L2_CID_GREEN_BLUE_OFFSET</constant></entry> + <entry>integer</entry> + </row> + <row> + <entry spanname="descr"> 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.</entry> + </row> <row><entry></entry></row> </tbody> </tgroup> 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 -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists