On Thu September 27 2012 17:16:18 Laurent Pinchart wrote:
> Set the capabilities field to global capabilities, and the device_caps
> field to the video node capabilities.
>
> This issue was found by the v4l2-compliance tool.
>
> Signed-off-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> ---
> drivers/media/usb/uvc/uvc_driver.c | 5 +++++
> drivers/media/usb/uvc/uvc_v4l2.c | 10 ++++++----
> drivers/media/usb/uvc/uvcvideo.h | 2 ++
> 3 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_driver.c
> b/drivers/media/usb/uvc/uvc_driver.c
> index 5967081..ae24f7d 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -1741,6 +1741,11 @@ static int uvc_register_video(struct uvc_device *dev,
> return ret;
> }
>
> + if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
> + stream->chain->caps |= V4L2_CAP_VIDEO_CAPTURE;
> + else
> + stream->chain->caps |= V4L2_CAP_VIDEO_OUTPUT;
> +
> atomic_inc(&dev->nstreams);
> return 0;
> }
> diff --git a/drivers/media/usb/uvc/uvc_v4l2.c
> b/drivers/media/usb/uvc/uvc_v4l2.c
> index 3bd9373..b1aa55f 100644
> --- a/drivers/media/usb/uvc/uvc_v4l2.c
> +++ b/drivers/media/usb/uvc/uvc_v4l2.c
> @@ -565,12 +565,14 @@ static long uvc_v4l2_do_ioctl(struct file *file,
> unsigned int cmd, void *arg)
> usb_make_path(stream->dev->udev,
> cap->bus_info, sizeof(cap->bus_info));
> cap->version = LINUX_VERSION_CODE;
> + cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
> + | chain->caps;
> if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
> - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
> - | V4L2_CAP_STREAMING;
> + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE
> + | V4L2_CAP_STREAMING;
> else
> - cap->capabilities = V4L2_CAP_VIDEO_OUTPUT
> - | V4L2_CAP_STREAMING;
> + cap->device_caps = V4L2_CAP_VIDEO_OUTPUT
> + | V4L2_CAP_STREAMING;
This seems weird. Wouldn't it be easier to do:
cap->device_caps = chain->caps | V4L2_CAP_STREAMING;
You don't need the if/else here.
> break;
> }
>
> diff --git a/drivers/media/usb/uvc/uvcvideo.h
> b/drivers/media/usb/uvc/uvcvideo.h
> index 7244455..28ff015 100644
> --- a/drivers/media/usb/uvc/uvcvideo.h
> +++ b/drivers/media/usb/uvc/uvcvideo.h
> @@ -371,6 +371,8 @@ struct uvc_video_chain {
> struct uvc_entity *selector; /* Selector unit */
>
> struct mutex ctrl_mutex; /* Protects ctrl.info */
> +
> + u32 caps; /* V4L2 chain-wide caps */
> };
>
> struct uvc_stats_frame {
>
Regards,
Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
