Commit 48213fe3 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls 



Those control, as their names imply, control the camera aperture
settings.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f129b03b

Documentation/DocBook/v4l/compat.xml

+11 −0
Original line number Diff line number Diff line
@@ -2332,6 +2332,17 @@ more information.</para> 
	</listitem>

      </orderedlist>

    </section>

    <section>

      <title>V4L2 in Linux 2.6.34</title>

      <orderedlist>

	<listitem>

	  <para>Added

<constant>V4L2_CID_IRIS_ABSOLUTE</constant> and

<constant>V4L2_CID_IRIS_RELATIVE</constant> controls to the

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

	  </para>

	</listitem>

      </orderedlist>

   </section>



   <section id="other">

Documentation/DocBook/v4l/controls.xml

+19 −0
Original line number Diff line number Diff line
@@ -1830,6 +1830,25 @@ wide-angle direction. The zoom speed unit is driver-specific.</entry> 
	  </row>

	  <row><entry></entry></row>



	  <row>

	    <entry spanname="id"><constant>V4L2_CID_IRIS_ABSOLUTE</constant>&nbsp;</entry>

	    <entry>integer</entry>

	  </row><row><entry spanname="descr">This control sets the

camera's aperture to the specified value. The unit is undefined.

Larger values open the iris wider, smaller values close it.</entry>

	  </row>

	  <row><entry></entry></row>



	  <row>

	    <entry spanname="id"><constant>V4L2_CID_IRIS_RELATIVE</constant>&nbsp;</entry>

	    <entry>integer</entry>

	  </row><row><entry spanname="descr">This control modifies the

camera's aperture by the specified amount. The unit is undefined.

Positive values open the iris one step further, negative values close

it one step further. This is a write-only control.</entry>

	  </row>

	  <row><entry></entry></row>



	  <row>

	    <entry spanname="id"><constant>V4L2_CID_PRIVACY</constant>&nbsp;</entry>

	    <entry>boolean</entry>

Documentation/DocBook/v4l/videodev2.h.xml

+3 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,9 @@ enum <link linkend="v4l2-exposure-auto-type">v4l2_exposure_auto_type</link> { 


#define V4L2_CID_PRIVACY                        (V4L2_CID_CAMERA_CLASS_BASE+16)



#define V4L2_CID_IRIS_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+17)

#define V4L2_CID_IRIS_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+18)



/* FM Modulator class control IDs */

#define V4L2_CID_FM_TX_CLASS_BASE               (V4L2_CTRL_CLASS_FM_TX | 0x900)

#define V4L2_CID_FM_TX_CLASS                    (V4L2_CTRL_CLASS_FM_TX | 1)

drivers/media/video/v4l2-common.c

+3 −0
Original line number Diff line number Diff line
@@ -489,6 +489,8 @@ const char *v4l2_ctrl_get_name(u32 id) 
	case V4L2_CID_FOCUS_ABSOLUTE:		return "Focus, Absolute";

	case V4L2_CID_FOCUS_RELATIVE:		return "Focus, Relative";

	case V4L2_CID_FOCUS_AUTO:		return "Focus, Automatic";

	case V4L2_CID_IRIS_ABSOLUTE:		return "Iris, Absolute";

	case V4L2_CID_IRIS_RELATIVE:		return "Iris, Relative";

	case V4L2_CID_ZOOM_ABSOLUTE:		return "Zoom, Absolute";

	case V4L2_CID_ZOOM_RELATIVE:		return "Zoom, Relative";

	case V4L2_CID_ZOOM_CONTINUOUS:		return "Zoom, Continuous";
@@ -643,6 +645,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste 
	case V4L2_CID_PAN_RELATIVE:

	case V4L2_CID_TILT_RELATIVE:

	case V4L2_CID_FOCUS_RELATIVE:

	case V4L2_CID_IRIS_RELATIVE:

	case V4L2_CID_ZOOM_RELATIVE:

		qctrl->flags |= V4L2_CTRL_FLAG_WRITE_ONLY;

		break;

include/linux/videodev2.h

+3 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,9 @@ enum v4l2_exposure_auto_type { 


#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)



#define V4L2_CID_IRIS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+17)

#define V4L2_CID_IRIS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+18)



/* FM Modulator class control IDs */

#define V4L2_CID_FM_TX_CLASS_BASE		(V4L2_CTRL_CLASS_FM_TX | 0x900)

#define V4L2_CID_FM_TX_CLASS			(V4L2_CTRL_CLASS_FM_TX | 1)