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

Commit d26a6635 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control 



V4L2_CID_POWER_LINE_FREQUENCY control allows applications to instruct
a driver what is the power line frequency so an appropriate filter
can be used by the device to cancel flicker by compensating the light
intensity ripple. Currently in the menu we have entries for 50 Hz and
60 Hz and for entirely disabling the anti-flicker filter.
However some devices are capable of automatically detecting the
frequency, so add V4L2_CID_POWER_LINE_FREQUENCY_AUTO entry for them.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2e56d933

Documentation/DocBook/media/v4l/controls.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -232,8 +232,9 @@ control is deprecated. New drivers and applications should use the 
	    <entry>Enables a power line frequency filter to avoid

	    <entry>Enables a power line frequency filter to avoid

flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are:

flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are:

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

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

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

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

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

<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2) and

<constant>V4L2_CID_POWER_LINE_FREQUENCY_AUTO</constant> (3).</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry><constant>V4L2_CID_HUE_AUTO</constant></entry>

	    <entry><constant>V4L2_CID_HUE_AUTO</constant></entry>

drivers/media/video/v4l2-ctrls.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -210,6 +210,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		"Disabled",

		"Disabled",

		"50 Hz",

		"50 Hz",

		"60 Hz",

		"60 Hz",

		"Auto",

		NULL

		NULL

	};

	};

	static const char * const camera_exposure_auto[] = {

	static const char * const camera_exposure_auto[] = {

include/linux/videodev2.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1169,6 +1169,7 @@ enum v4l2_power_line_frequency { 
	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,

	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,

	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,

	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,

	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,

	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,

	V4L2_CID_POWER_LINE_FREQUENCY_AUTO	= 3,

};

};

#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)

#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)

#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)

#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)