[PATCH v2 0/4] Add zoom and privacy controls

[PATCH v2 0/4] Add zoom and privacy controls

[Laurent Pinchart]

Hi,

this patch series adds support for zoom and privacy controls to V4L2:

- the first two patches add the controls to videodev2.h
- the 3rd patch updates v4l2-common.c with missing control names
- the 4th patch updates the v4l2 api documentation

I've integrated Hans Verkuil's remark regarding the 
V4L2_CID_EXPOSURE_AUTO_PRIORITY control name.

If there is no more feedback I'll commit the changes to my hg tree and will 
request a push.

Best regards,

Laurent Pinchart

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

[PATCH v2 1/4] v4l2: Add camera zoom controls

[Laurent Pinchart]

The zoom controls move the zoom lens group to a an absolute position, as a
relative displacement or at a given speed until reaching physical device
limits. Positive values move the zoom lens group towards the telephoto
direction, negative values towards the wide-angle direction.

Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
--

diff -r 0280330fd4a0 linux/include/linux/videodev2.h
--- a/linux/include/linux/videodev2.h	Wed Nov 26 00:20:42 2008 +0100
+++ b/linux/include/linux/videodev2.h	Thu Nov 27 15:38:15 2008 +0100
@@ -1118,6 +1118,10 @@
 #define V4L2_CID_FOCUS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+11)
 #define V4L2_CID_FOCUS_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+12)
 
+#define V4L2_CID_ZOOM_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+13)
+#define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
+#define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
+
 /*
  *	T U N I N G
  */

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

[PATCH v2 2/4] v4l2: Add privacy control

[Laurent Pinchart]

The privacy control prevents video from being acquired by the camera. A true 
value indicates that no image can be captured. Devices that implement the 
privacy control must support read access and may support write access.

Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
--

diff -r 0280330fd4a0 linux/include/linux/videodev2.h
--- a/linux/include/linux/videodev2.h	Wed Nov 26 00:20:42 2008 +0100
+++ b/linux/include/linux/videodev2.h	Thu Nov 27 15:38:23 2008 +0100
@@ -1122,6 +1122,8 @@
 #define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
 #define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
 
+#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
+
 /*
  *	T U N I N G
  */

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

[PATCH v2 3/4] v4l2: Add missing control names

[Laurent Pinchart]

Update v4l2_ctrl_get_name() and v4l2_ctrl_get_menu() with missing
control names and menu values.

Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
--

diff -r 0280330fd4a0 linux/drivers/media/video/v4l2-common.c
--- a/linux/drivers/media/video/v4l2-common.c	Wed Nov 26 00:20:42 2008 +0100
+++ b/linux/drivers/media/video/v4l2-common.c	Thu Nov 27 15:44:18 2008 +0100
@@ -321,6 +321,19 @@
 		"Private packet, IVTV format",
 		NULL
 	};
+	static const char *camera_power_line_frequency[] = {
+		"Disabled",
+		"50 Hz",
+		"60 Hz",
+		NULL
+	};
+	static const char *camera_exposure_auto[] = {
+		"Auto Mode",
+		"Manual Mode",
+		"Shutter Priority Mode",
+		"Aperture Priority Mode",
+		NULL
+	};
 
 	switch (id) {
 		case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
@@ -353,6 +366,10 @@
 			return mpeg_stream_type;
 		case V4L2_CID_MPEG_STREAM_VBI_FMT:
 			return mpeg_stream_vbi_fmt;
+		case V4L2_CID_POWER_LINE_FREQUENCY:
+			return camera_power_line_frequency;
+		case V4L2_CID_EXPOSURE_AUTO:
+			return camera_exposure_auto;
 		default:
 			return NULL;
 	}
@@ -364,17 +381,37 @@
 {
 	switch (id) {
 	/* USER controls */
-	case V4L2_CID_USER_CLASS: 	return "User Controls";
-	case V4L2_CID_AUDIO_VOLUME: 	return "Volume";
-	case V4L2_CID_AUDIO_MUTE: 	return "Mute";
-	case V4L2_CID_AUDIO_BALANCE: 	return "Balance";
-	case V4L2_CID_AUDIO_BASS: 	return "Bass";
-	case V4L2_CID_AUDIO_TREBLE: 	return "Treble";
-	case V4L2_CID_AUDIO_LOUDNESS: 	return "Loudness";
-	case V4L2_CID_BRIGHTNESS: 	return "Brightness";
-	case V4L2_CID_CONTRAST: 	return "Contrast";
-	case V4L2_CID_SATURATION: 	return "Saturation";
-	case V4L2_CID_HUE: 		return "Hue";
+	case V4L2_CID_USER_CLASS: 		return "User Controls";
+	case V4L2_CID_AUDIO_VOLUME: 		return "Volume";
+	case V4L2_CID_AUDIO_MUTE: 		return "Mute";
+	case V4L2_CID_AUDIO_BALANCE: 		return "Balance";
+	case V4L2_CID_AUDIO_BASS: 		return "Bass";
+	case V4L2_CID_AUDIO_TREBLE: 		return "Treble";
+	case V4L2_CID_AUDIO_LOUDNESS: 		return "Loudness";
+	case V4L2_CID_BRIGHTNESS: 		return "Brightness";
+	case V4L2_CID_CONTRAST: 		return "Contrast";
+	case V4L2_CID_SATURATION: 		return "Saturation";
+	case V4L2_CID_HUE: 			return "Hue";
+	case V4L2_CID_BLACK_LEVEL:		return "Black Level";
+	case V4L2_CID_AUTO_WHITE_BALANCE:	return "White Balance, Automatic";
+	case V4L2_CID_DO_WHITE_BALANCE:		return "Do White Balance";
+	case V4L2_CID_RED_BALANCE:		return "Red Balance";
+	case V4L2_CID_BLUE_BALANCE:		return "Blue Balance";
+	case V4L2_CID_GAMMA:			return "Gamma";
+	case V4L2_CID_EXPOSURE:			return "Exposure";
+	case V4L2_CID_AUTOGAIN:			return "Gain, Automatic";
+	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";
+	case V4L2_CID_SHARPNESS:		return "Sharpness";
+	case V4L2_CID_BACKLIGHT_COMPENSATION:	return "Backlight Compensation";
+	case V4L2_CID_CHROMA_AGC:		return "Chroma AGC";
+	case V4L2_CID_COLOR_KILLER:		return "Color Killer";
 
 	/* MPEG controls */
 	case V4L2_CID_MPEG_CLASS: 		return "MPEG Encoder Controls";
@@ -411,6 +448,25 @@
 	case V4L2_CID_MPEG_STREAM_PES_ID_VIDEO: return "Stream PES Video ID";
 	case V4L2_CID_MPEG_STREAM_VBI_FMT:	return "Stream VBI Format";
 
+	/* CAMERA controls */
+	case V4L2_CID_CAMERA_CLASS:		return "Camera Controls";
+	case V4L2_CID_EXPOSURE_AUTO:		return "Auto-Exposure";
+	case V4L2_CID_EXPOSURE_ABSOLUTE:	return "Exposure Time, Absolute";
+	case V4L2_CID_EXPOSURE_AUTO_PRIORITY:	return "Exposure, Dynamic Framerate";
+	case V4L2_CID_PAN_RELATIVE:		return "Pan, Relative";
+	case V4L2_CID_TILT_RELATIVE:		return "Tilt, Relative";
+	case V4L2_CID_PAN_RESET:		return "Pan, Reset";
+	case V4L2_CID_TILT_RESET:		return "Tilt, Reset";
+	case V4L2_CID_PAN_ABSOLUTE:		return "Pan, Absolute";
+	case V4L2_CID_TILT_ABSOLUTE:		return "Tilt, Absolute";
+	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_ZOOM_ABSOLUTE:		return "Zoom, Absolute";
+	case V4L2_CID_ZOOM_RELATIVE:		return "Zoom, Relative";
+	case V4L2_CID_ZOOM_CONTINUOUS:		return "Zoom, Continuous";
+	case V4L2_CID_PRIVACY:			return "Privacy";
+
 	default:
 		return NULL;
 	}
@@ -429,14 +485,22 @@
 	switch (qctrl->id) {
 	case V4L2_CID_AUDIO_MUTE:
 	case V4L2_CID_AUDIO_LOUDNESS:
+	case V4L2_CID_AUTO_WHITE_BALANCE:
+	case V4L2_CID_AUTOGAIN:
+	case V4L2_CID_HFLIP:
+	case V4L2_CID_VFLIP:
+	case V4L2_CID_HUE_AUTO:
 	case V4L2_CID_MPEG_AUDIO_MUTE:
 	case V4L2_CID_MPEG_VIDEO_MUTE:
 	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
 	case V4L2_CID_MPEG_VIDEO_PULLDOWN:
+	case V4L2_CID_EXPOSURE_AUTO_PRIORITY:
+	case V4L2_CID_PRIVACY:
 		qctrl->type = V4L2_CTRL_TYPE_BOOLEAN;
 		min = 0;
 		max = step = 1;
 		break;
+	case V4L2_CID_POWER_LINE_FREQUENCY:
 	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
 	case V4L2_CID_MPEG_AUDIO_ENCODING:
 	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:
@@ -452,10 +516,12 @@
 	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
 	case V4L2_CID_MPEG_STREAM_TYPE:
 	case V4L2_CID_MPEG_STREAM_VBI_FMT:
+	case V4L2_CID_EXPOSURE_AUTO:
 		qctrl->type = V4L2_CTRL_TYPE_MENU;
 		step = 1;
 		break;
 	case V4L2_CID_USER_CLASS:
+	case V4L2_CID_CAMERA_CLASS:
 	case V4L2_CID_MPEG_CLASS:
 		qctrl->type = V4L2_CTRL_TYPE_CTRL_CLASS;
 		qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

[PATCH v2 4/4] v4l2: Document zoom and privacy controls

[Laurent Pinchart]

Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
--

As the source isn't under version control I've generated a diff against the
0.24 tarball.

diff -aur v4l2spec-0.24-orig/controls.sgml v4l2spec-0.24/controls.sgml
--- v4l2spec-0.24-orig/controls.sgml	2008-03-06 16:42:11.000000000 +0100
+++ v4l2spec-0.24/controls.sgml	2008-12-12 13:52:20.000000000 +0100
@@ -1645,6 +1645,49 @@
 is enabled is undefined, drivers should ignore such requests.</entry>
           </row>
           <row><entry></entry></row>
+
+          <row>
+            <entry 
spanname="id"><constant>V4L2_CID_ZOOM_ABSOLUTE</constant>&nbsp;</entry>
+            <entry>integer</entry>
+          </row><row><entry spanname="descr">Specify the objective lens
+focal length as an absolute value. The zoom unit is driver-specific and its
+value should be a positive integer.</entry>
+          </row>
+          <row><entry></entry></row>
+
+          <row>
+            <entry 
spanname="id"><constant>V4L2_CID_ZOOM_RELATIVE</constant>&nbsp;</entry>
+            <entry>integer</entry>
+          </row><row><entry spanname="descr">Specify the objective lens
+focal length relatively to the current value. Positive values move the zoom
+lens group towards the telephoto direction, negative values towards the
+wide-angle direction. The zoom unit is driver-specific.</entry>
+          </row>
+          <row><entry></entry></row>
+
+          <row>
+            <entry 
spanname="id"><constant>V4L2_CID_ZOOM_CONTINUOUS</constant>&nbsp;</entry>
+            <entry>integer</entry>
+          </row><row><entry spanname="descr">Move the objective lens group
+at the specified speed until it reaches physical device limits or until an
+explicit request to stop the movement. A positive value moves the zoom lens
+group towards the telephoto direction. A value of zero stops the zoom lens
+group movement. A negative value moves the zoom lens group towards the
+wide-angle direction. The zoom speed unit is driver-specific.</entry>
+          </row>
+          <row><entry></entry></row>
+
+          <row>
+            <entry 
spanname="id"><constant>V4L2_CID_PRIVACY</constant>&nbsp;</entry>
+            <entry>boolean</entry>
+          </row><row><entry spanname="descr">Prevent video from being 
acquired
+by the camera. When this control is set to <constant>TRUE</constant> (1), no
+image can be captured by the camera. Common means to enforce privacy are
+mechanical obturation of the sensor and firmware image processing, but the
+device is not restricted to these methods. Devices that implement the privacy
+control must support read access and may support write access.</entry>
+          </row>
+          <row><entry></entry></row>
         </tbody>
       </tgroup>
     </table>
diff -aur v4l2spec-0.24-orig/videodev2.h v4l2spec-0.24/videodev2.h
--- v4l2spec-0.24-orig/videodev2.h	2008-03-06 16:42:11.000000000 +0100
+++ v4l2spec-0.24/videodev2.h	2008-11-27 10:32:07.000000000 +0100
@@ -1093,6 +1093,12 @@
 #define V4L2_CID_FOCUS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+11)
 #define V4L2_CID_FOCUS_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+12)
 
+#define V4L2_CID_ZOOM_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+13)
+#define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
+#define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
+
+#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
+
 /*
  *	T U N I N G
  */

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

Re: [PATCH v2 3/4] v4l2: Add missing control names

[Hans Verkuil]

Hi Laurent,

Just one tiny suggestion:

On Friday 12 December 2008 14:10:36 Laurent Pinchart wrote:
> +	/* CAMERA controls */
> +	case V4L2_CID_CAMERA_CLASS:		return "Camera Controls";
> +	case V4L2_CID_EXPOSURE_AUTO:		return "Auto-Exposure";

I would suggest "Auto Exposure" (no dash). It seems to be the most 
common way to write it. At least to my eyes the dash looks strange. 
Perhaps some native English speakers can help out here?

Regards,

	Hans

-- 
Hans Verkuil - video4linux developer - sponsored by TANDBERG

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

Re: [PATCH v2 3/4] v4l2: Add missing control names

[Andy Walls]

On Fri, 2008-12-12 at 14:25 +0100, Hans Verkuil wrote:
> Hi Laurent,
> 
> Just one tiny suggestion:
> 
> On Friday 12 December 2008 14:10:36 Laurent Pinchart wrote:
> > +	/* CAMERA controls */
> > +	case V4L2_CID_CAMERA_CLASS:		return "Camera Controls";
> > +	case V4L2_CID_EXPOSURE_AUTO:		return "Auto-Exposure";
> 
> I would suggest "Auto Exposure" (no dash). It seems to be the most 
> common way to write it. At least to my eyes the dash looks strange. 
> Perhaps some native English speakers can help out here?

You actually need a professional English teacher, professor, editor, or
writer for that answer.  The hyphen has, to me, rather confusing rules.

IANAET, but....

For example when modifying a noun you, would likely hyphenate
adjective-noun modifiers:

"Auto-exposure setting"

But in simple adjective-noun pairs, you would not, as adjectives are
understood to modify nouns:

"Auto exposure"


Also, new compound words in English often get hyphenated when
introduced, but the hyphen disappears when the word comes into common
usage: e-mail vs. email.  But even if this were the path "auto-exposure"
took initially in English, I, as a native English speaker, would likely
never write "autoexposure".  "o" and "e" as directly adjacent syllabic
vowels in a written word just seems "wrong".  

Regards,
Andy

> 
> Regards,
> 
> 	Hans
> 

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

Re: [PATCH v2 3/4] v4l2: Add missing control names

[Laurent Pinchart]

Hi Andy,

On Friday 12 December 2008, Andy Walls wrote:
> On Fri, 2008-12-12 at 14:25 +0100, Hans Verkuil wrote:
> > Hi Laurent,
> >
> > Just one tiny suggestion:
> >
> > On Friday 12 December 2008 14:10:36 Laurent Pinchart wrote:
> > > +	/* CAMERA controls */
> > > +	case V4L2_CID_CAMERA_CLASS:		return "Camera Controls";
> > > +	case V4L2_CID_EXPOSURE_AUTO:		return "Auto-Exposure";
> >
> > I would suggest "Auto Exposure" (no dash). It seems to be the most
> > common way to write it. At least to my eyes the dash looks strange.
> > Perhaps some native English speakers can help out here?
>
> You actually need a professional English teacher, professor, editor, or
> writer for that answer.  The hyphen has, to me, rather confusing rules.
>
> IANAET, but....
>
> For example when modifying a noun you, would likely hyphenate
> adjective-noun modifiers:
>
> "Auto-exposure setting"
>
> But in simple adjective-noun pairs, you would not, as adjectives are
> understood to modify nouns:
>
> "Auto exposure"
>
>
> Also, new compound words in English often get hyphenated when
> introduced, but the hyphen disappears when the word comes into common
> usage: e-mail vs. email.  But even if this were the path "auto-exposure"
> took initially in English, I, as a native English speaker, would likely
> never write "autoexposure".  "o" and "e" as directly adjacent syllabic
> vowels in a written word just seems "wrong".

Thanks for the answer. I'll then go for "Auto Exposure".

Regards,

Laurent Pinchart

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list