From: Vincent Palatin <vpalatin@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
Pawel Osciak <posciak@chromium.org>,
"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Olof Johansson <olofj@chromium.org>,
Zach Kuznia <zork@chromium.org>,
Mauro Carvalho Chehab <m.chehab@samsung.com>
Subject: Re: [PATCH v4 2/2] V4L: uvcvideo: Add support for pan/tilt speed controls
Date: Mon, 6 Oct 2014 13:41:01 -0700 [thread overview]
Message-ID: <CAP_ceTz8BRQoFxkgb085_gOh29x8anvQNodAGMkgOukk02x29g@mail.gmail.com> (raw)
In-Reply-To: <1510196.ldtLAThOeq@avalon>
On Thu, Sep 4, 2014 at 1:29 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>
> Hi Vincent,
>
> Thank you for the patch.
>
> On Wednesday 03 September 2014 17:47:48 Vincent Palatin wrote:
> > Map V4L2_CID_TILT_SPEED and V4L2_CID_PAN_SPEED to the standard UVC
> > CT_PANTILT_RELATIVE_CONTROL terminal control request.
> >
> > Tested by plugging a Logitech ConferenceCam C3000e USB camera
> > and controlling pan/tilt from the userspace using the VIDIOC_S_CTRL ioctl.
> > Verified that it can pan and tilt at the same time in both directions.
> >
> > Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
>
> Small comment here, as Pawel has reviewed the previous version, you could have
> added his Reviewed-by tag to the patch.
>
> > ---
> > Changes from v1/v2:
> > - rebased
> > Changes from v3:
> > - removed gerrit-id
> >
> > drivers/media/usb/uvc/uvc_ctrl.c | 58 ++++++++++++++++++++++++++++++++++---
> > 1 file changed, 55 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c
> > b/drivers/media/usb/uvc/uvc_ctrl.c index 0eb82106..d703cb0 100644
> > --- a/drivers/media/usb/uvc/uvc_ctrl.c
> > +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> > @@ -309,9 +309,8 @@ static struct uvc_control_info uvc_ctrls[] = {
> > .selector = UVC_CT_PANTILT_RELATIVE_CONTROL,
> > .index = 12,
> > .size = 4,
> > - .flags = UVC_CTRL_FLAG_SET_CUR | UVC_CTRL_FLAG_GET_MIN
> > - | UVC_CTRL_FLAG_GET_MAX | UVC_CTRL_FLAG_GET_RES
> > - | UVC_CTRL_FLAG_GET_DEF
> > + .flags = UVC_CTRL_FLAG_SET_CUR
> > + | UVC_CTRL_FLAG_GET_RANGE
> > | UVC_CTRL_FLAG_AUTO_UPDATE,
> > },
> > {
> > @@ -391,6 +390,35 @@ static void uvc_ctrl_set_zoom(struct
> > uvc_control_mapping *mapping, data[2] = min((int)abs(value), 0xff);
> > }
> >
> > +static __s32 uvc_ctrl_get_rel_speed(struct uvc_control_mapping *mapping,
> > + __u8 query, const __u8 *data)
> > +{
> > + int first = mapping->offset / 8;
>
> Nitpicking, I would use unsigned int instead of int here, as the value can't
> be negative (same comment for the next function).
>
> If you're fine with that there's no need to resubmit, I can modify this when
> applying.
Yes, I'm fine with that.
>
>
> > + __s8 rel = (__s8)data[first];
> > +
> > + switch (query) {
> > + case UVC_GET_CUR:
> > + return (rel == 0) ? 0 : (rel > 0 ? data[first+1]
> > + : -data[first+1]);
> > + case UVC_GET_MIN:
> > + return -data[first+1];
> > + case UVC_GET_MAX:
> > + case UVC_GET_RES:
> > + case UVC_GET_DEF:
> > + default:
> > + return data[first+1];
> > + }
> > +}
> > +
> > +static void uvc_ctrl_set_rel_speed(struct uvc_control_mapping *mapping,
> > + __s32 value, __u8 *data)
> > +{
> > + int first = mapping->offset / 8;
> > +
> > + data[first] = value == 0 ? 0 : (value > 0) ? 1 : 0xff;
> > + data[first+1] = min_t(int, abs(value), 0xff);
> > +}
> > +
> > static struct uvc_control_mapping uvc_ctrl_mappings[] = {
> > {
> > .id = V4L2_CID_BRIGHTNESS,
> > @@ -677,6 +705,30 @@ static struct uvc_control_mapping uvc_ctrl_mappings[] =
> > { .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
> > },
> > {
> > + .id = V4L2_CID_PAN_SPEED,
> > + .name = "Pan (Speed)",
> > + .entity = UVC_GUID_UVC_CAMERA,
> > + .selector = UVC_CT_PANTILT_RELATIVE_CONTROL,
> > + .size = 16,
> > + .offset = 0,
> > + .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
> > + .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
> > + .get = uvc_ctrl_get_rel_speed,
> > + .set = uvc_ctrl_set_rel_speed,
> > + },
> > + {
> > + .id = V4L2_CID_TILT_SPEED,
> > + .name = "Tilt (Speed)",
> > + .entity = UVC_GUID_UVC_CAMERA,
> > + .selector = UVC_CT_PANTILT_RELATIVE_CONTROL,
> > + .size = 16,
> > + .offset = 16,
> > + .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
> > + .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
> > + .get = uvc_ctrl_get_rel_speed,
> > + .set = uvc_ctrl_set_rel_speed,
> > + },
> > + {
> > .id = V4L2_CID_PRIVACY,
> > .name = "Privacy",
> > .entity = UVC_GUID_UVC_CAMERA,
>
> --
> Regards,
>
> Laurent Pinchart
>
next prev parent reply other threads:[~2014-10-06 20:41 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 [this message]
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 ` [PATCH v2 " Vincent Palatin
2014-09-03 4:54 ` 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=CAP_ceTz8BRQoFxkgb085_gOh29x8anvQNodAGMkgOukk02x29g@mail.gmail.com \
--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).