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

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

[media] V4L: Remove deprecated image centering controls 



It has been over 3 years since the V4L2_CID_[HV]CENTER were deprecated.
Clean up the DocBook and remove the V4L2_CID_VCENTER_DEPRECATED,
V4L2_CID_VCENTER_DEPRECATED control related paragraphs.
Remove the V4L2_CID_[HV]CENTER controls definitions from v4l2-controls.h,
these controls are not used by any driver in the mainline now.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1b73ba0b

Documentation/DocBook/media/v4l/controls.xml

+0 −23
Original line number Diff line number Diff line
@@ -203,29 +203,6 @@ and should not be used in new drivers and applications.</entry> 
	    <entry>boolean</entry>

	    <entry>Mirror the picture vertically.</entry>

	  </row>

	<row>

	  <entry><constant>V4L2_CID_HCENTER_DEPRECATED</constant> (formerly <constant>V4L2_CID_HCENTER</constant>)</entry>

	    <entry>integer</entry>

	    <entry>Horizontal image centering. This control is

deprecated. New drivers and applications should use the <link

linkend="camera-controls">Camera class controls</link>

<constant>V4L2_CID_PAN_ABSOLUTE</constant>,

<constant>V4L2_CID_PAN_RELATIVE</constant> and

<constant>V4L2_CID_PAN_RESET</constant> instead.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_VCENTER_DEPRECATED</constant>

	    (formerly <constant>V4L2_CID_VCENTER</constant>)</entry>

	    <entry>integer</entry>

	    <entry>Vertical image centering. Centering is intended to

<emphasis>physically</emphasis> adjust cameras. For image cropping see

<xref linkend="crop" />, for clipping <xref linkend="overlay" />. This

control is deprecated. New drivers and applications should use the

<link linkend="camera-controls">Camera class controls</link>

<constant>V4L2_CID_TILT_ABSOLUTE</constant>,

<constant>V4L2_CID_TILT_RELATIVE</constant> and

<constant>V4L2_CID_TILT_RESET</constant> instead.</entry>

	  </row>

	  <row id="v4l2-power-line-frequency">

	    <entry><constant>V4L2_CID_POWER_LINE_FREQUENCY</constant></entry>

	    <entry>enum</entry>

drivers/media/v4l2-core/v4l2-ctrls.c

+0 −2
Original line number Diff line number Diff line
@@ -577,8 +577,6 @@ const char *v4l2_ctrl_get_name(u32 id) 
	case V4L2_CID_GAIN:			return "Gain";

	case V4L2_CID_HFLIP:			return "Horizontal Flip";

	case V4L2_CID_VFLIP:			return "Vertical Flip";

	case V4L2_CID_HCENTER:			return "Horizontal Center";

	case V4L2_CID_VCENTER:			return "Vertical Center";

	case V4L2_CID_POWER_LINE_FREQUENCY:	return "Power Line Frequency";

	case V4L2_CID_HUE_AUTO:			return "Hue, Automatic";

	case V4L2_CID_WHITE_BALANCE_TEMPERATURE: return "White Balance Temperature";

include/uapi/linux/v4l2-controls.h

+0 −4
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ 
#define V4L2_CID_HFLIP			(V4L2_CID_BASE+20)

#define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)



/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */

#define V4L2_CID_HCENTER		(V4L2_CID_BASE+22)

#define V4L2_CID_VCENTER		(V4L2_CID_BASE+23)



#define V4L2_CID_POWER_LINE_FREQUENCY	(V4L2_CID_BASE+24)

enum v4l2_power_line_frequency {

	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,