From: Vincent Palatin <vpalatin@chromium.org>
To: Hans de Goede <hdegoede@redhat.com>,
Pawel Osciak <posciak@chromium.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
linux-media@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Olof Johansson <olofj@chromium.org>,
Zach Kuznia <zork@chromium.org>,
Mauro Carvalho Chehab <m.chehab@samsung.com>,
Vincent Palatin <vpalatin@chromium.org>
Subject: [PATCH v2 1/2] [media] V4L: Add camera pan/tilt speed controls
Date: Fri, 15 Aug 2014 12:08:44 -0700 [thread overview]
Message-ID: <1408129724-17669-1-git-send-email-vpalatin@chromium.org> (raw)
In-Reply-To: <CACHYQ-rtHfVmF4DstxhWe0zWNH3ujjniVBwONBGW3f4Uw=rvkg@mail.gmail.com>
The V4L2_CID_PAN_SPEED and V4L2_CID_TILT_SPEED controls allow to move the
camera by setting its rotation speed around its axis.
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
---
Changes from v1:
- update the documentation wording according to Pawel suggestion.
Documentation/DocBook/media/v4l/compat.xml | 10 ++++++++++
Documentation/DocBook/media/v4l/controls.xml | 21 +++++++++++++++++++++
drivers/media/v4l2-core/v4l2-ctrls.c | 2 ++
include/uapi/linux/v4l2-controls.h | 2 ++
4 files changed, 35 insertions(+)
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index eee6f0f..21910e9 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2545,6 +2545,16 @@ fields changed from _s32 to _u32.
</orderedlist>
</section>
+ <section>
+ <title>V4L2 in Linux 3.17</title>
+ <orderedlist>
+ <listitem>
+ <para>Added <constant>V4L2_CID_PAN_SPEED</constant> and
+ <constant>V4L2_CID_TILT_SPEED</constant> camera controls.</para>
+ </listitem>
+ </orderedlist>
+ </section>
+
<section id="other">
<title>Relation of V4L2 to other Linux multimedia APIs</title>
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 47198ee..be88e64 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3914,6 +3914,27 @@ by exposure, white balance or focus controls.</entry>
</row>
<row><entry></entry></row>
+ <row>
+ <entry spanname="id"><constant>V4L2_CID_PAN_SPEED</constant> </entry>
+ <entry>integer</entry>
+ </row><row><entry spanname="descr">This control turns the
+camera horizontally at the specific speed. The unit is undefined. A
+positive value moves the camera to the right (clockwise when viewed
+from above), a negative value to the left. A value of zero stops the motion
+if one is in progress and has no effect otherwise.</entry>
+ </row>
+ <row><entry></entry></row>
+
+ <row>
+ <entry spanname="id"><constant>V4L2_CID_TILT_SPEED</constant> </entry>
+ <entry>integer</entry>
+ </row><row><entry spanname="descr">This control turns the
+camera vertically at the specified speed. The unit is undefined. A
+positive value moves the camera up, a negative value down. A value of zero
+stops the motion if one is in progress and has no effect otherwise.</entry>
+ </row>
+ <row><entry></entry></row>
+
</tbody>
</tgroup>
</table>
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 55c6832..57ddaf4 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -787,6 +787,8 @@ const char *v4l2_ctrl_get_name(u32 id)
case V4L2_CID_AUTO_FOCUS_STOP: return "Auto Focus, Stop";
case V4L2_CID_AUTO_FOCUS_STATUS: return "Auto Focus, Status";
case V4L2_CID_AUTO_FOCUS_RANGE: return "Auto Focus, Range";
+ case V4L2_CID_PAN_SPEED: return "Pan, Speed";
+ case V4L2_CID_TILT_SPEED: return "Tilt, Speed";
/* FM Radio Modulator control */
/* Keep the order of the 'case's the same as in videodev2.h! */
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 2ac5597..5576044 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -745,6 +745,8 @@ enum v4l2_auto_focus_range {
V4L2_AUTO_FOCUS_RANGE_INFINITY = 3,
};
+#define V4L2_CID_PAN_SPEED (V4L2_CID_CAMERA_CLASS_BASE+32)
+#define V4L2_CID_TILT_SPEED (V4L2_CID_CAMERA_CLASS_BASE+33)
/* FM Modulator class control IDs */
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-08-15 19:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 0:38 [PATCH] V4L: uvcvideo: Add support for relative pan/tilt controls Vincent Palatin
2014-06-17 6:12 ` Hans de Goede
2014-06-17 14:45 ` [PATCH v2] " Vincent Palatin
[not found] ` <CACHYQ-rSk6etrX8RXF4w7aA_LJ9nzGtfJMOjhBOg49BZ4gaWgw@mail.gmail.com>
2014-06-25 9:54 ` Laurent Pinchart
2014-07-08 23:28 ` Vincent Palatin
2014-07-08 23:49 ` [PATCH 1/2] [media] V4L: Add camera pan/tilt speed controls Vincent Palatin
2014-07-08 23:49 ` [PATCH 2/2] V4L: uvcvideo: Add support for " Vincent Palatin
2014-09-03 4:57 ` Pawel Osciak
2014-09-03 19:40 ` [PATCH v3 " Vincent Palatin
2014-09-04 0:37 ` Pawel Osciak
2014-09-04 0:47 ` [PATCH v4 " Vincent Palatin
2014-09-04 20:29 ` Laurent Pinchart
2014-10-06 20:41 ` Vincent Palatin
2014-10-06 21:05 ` [PATCH v5 " Vincent Palatin
2014-10-07 16:36 ` Laurent Pinchart
2014-10-07 16:41 ` Vincent Palatin
2014-09-04 20:35 ` [PATCH v4 " Laurent Pinchart
2014-10-06 20:44 ` Vincent Palatin
2014-07-31 17:22 ` [PATCH 1/2] [media] V4L: Add camera " Vincent Palatin
[not found] ` <CACHYQ-o0FWSSHRmNhQ+id2uvHHWqVzQXQpmu31_e4OmDeVd_CQ@mail.gmail.com>
2014-08-06 15:10 ` Vincent Palatin
2014-08-07 2:18 ` Pawel Osciak
2014-08-08 16:41 ` Vincent Palatin
2014-08-15 19:08 ` Vincent Palatin [this message]
2014-09-03 4:54 ` [PATCH v2 " Pawel Osciak
2014-09-03 19:35 ` Vincent Palatin
2014-09-03 19:38 ` [PATCH v3 " Vincent Palatin
2014-10-06 21:04 ` [PATCH v5 " Vincent Palatin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408129724-17669-1-git-send-email-vpalatin@chromium.org \
--to=vpalatin@chromium.org \
--cc=hdegoede@redhat.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=olofj@chromium.org \
--cc=posciak@chromium.org \
--cc=zork@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).