Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35e6aa9f authored by Xiaolin Zhang's avatar Xiaolin Zhang Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: core: add support for more color effects 



Add support for more color effects (negative, sketch, emboss, etc) by
extending the  v4l2_colorfx enum items.

Signed-off-by: default avatarXiaolin Zhang <xiaolin.zhang@intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aec11e5d

Documentation/DocBook/v4l/controls.xml

+9 −2
Original line number Diff line number Diff line
@@ -283,8 +283,15 @@ minimum value disables backlight compensation.</entry> 
	    <entry>Selects a color effect. Possible values for

<constant>enum v4l2_colorfx</constant> are:

<constant>V4L2_COLORFX_NONE</constant> (0),

<constant>V4L2_COLORFX_BW</constant> (1) and

<constant>V4L2_COLORFX_SEPIA</constant> (2).</entry>

<constant>V4L2_COLORFX_BW</constant> (1),

<constant>V4L2_COLORFX_SEPIA</constant> (2),

<constant>V4L2_COLORFX_NEGATIVE</constant> (3),

<constant>V4L2_COLORFX_EMBOSS</constant> (4),

<constant>V4L2_COLORFX_SKETCH</constant> (5),

<constant>V4L2_COLORFX_SKY_BLUE</constant> (6),

<constant>V4L2_COLORFX_GRASS_GREEN</constant> (7),

<constant>V4L2_COLORFX_SKIN_WHITEN</constant> (8) and

<constant>V4L2_COLORFX_VIVID</constant> (9).</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_ROTATE</constant></entry>

Documentation/DocBook/v4l/videodev2.h.xml

+7 −0
Original line number Diff line number Diff line
@@ -1018,6 +1018,13 @@ enum <link linkend="v4l2-colorfx">v4l2_colorfx</link> { 
        V4L2_COLORFX_NONE       = 0,

        V4L2_COLORFX_BW         = 1,

        V4L2_COLORFX_SEPIA      = 2,

        V4L2_COLORFX_NEGATIVE   = 3,

        V4L2_COLORFX_EMBOSS     = 4,

        V4L2_COLORFX_SKETCH     = 5,

        V4L2_COLORFX_SKY_BLUE   = 6,

        V4L2_COLORFX_GRASS_GREEN = 7,

        V4L2_COLORFX_SKIN_WHITEN = 8,

        V4L2_COLORFX_VIVID      = 9.

};

#define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)

#define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)

drivers/media/video/v4l2-common.c

+7 −0
Original line number Diff line number Diff line
@@ -343,6 +343,13 @@ const char **v4l2_ctrl_get_menu(u32 id) 
		"None",

		"Black & White",

		"Sepia",

		"Negative",

		"Emboss",

		"Sketch",

		"Sky blue",

		"Grass green",

		"Skin whiten",

		"Vivid",

		NULL

	};

	static const char *tune_preemphasis[] = {

include/linux/videodev2.h

+7 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,13 @@ enum v4l2_colorfx { 
	V4L2_COLORFX_NONE	= 0,

	V4L2_COLORFX_BW		= 1,

	V4L2_COLORFX_SEPIA	= 2,

	V4L2_COLORFX_NEGATIVE = 3,

	V4L2_COLORFX_EMBOSS = 4,

	V4L2_COLORFX_SKETCH = 5,

	V4L2_COLORFX_SKY_BLUE = 6,

	V4L2_COLORFX_GRASS_GREEN = 7,

	V4L2_COLORFX_SKIN_WHITEN = 8,

	V4L2_COLORFX_VIVID = 9,

};

#define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)

#define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)