From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v5 02/13] media: uvcvideo: Set capability in s_param
Date: Tue, 16 Mar 2021 18:59:52 +0100 [thread overview]
Message-ID: <20210316180004.1605727-3-ribalda@chromium.org> (raw)
In-Reply-To: <20210316180004.1605727-1-ribalda@chromium.org>
Fixes v4l2-compliance:
Format ioctls (Input 0):
warn: v4l2-test-formats.cpp(1339): S_PARM is supported but doesn't report V4L2_CAP_TIMEPERFRAME
fail: v4l2-test-formats.cpp(1241): node->has_frmintervals && !cap->capability
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_v4l2.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 252136cc885c..157310c0ca87 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -472,10 +472,13 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream,
uvc_simplify_fraction(&timeperframe.numerator,
&timeperframe.denominator, 8, 333);
- if (parm->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ if (parm->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
parm->parm.capture.timeperframe = timeperframe;
- else
+ parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
+ } else {
parm->parm.output.timeperframe = timeperframe;
+ parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME;
+ }
return 0;
}
--
2.31.0.rc2.261.g7f71774620-goog
next prev parent reply other threads:[~2021-03-16 18:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 17:59 [PATCH v5 00/13] uvcvideo: Fix v4l2-compliance errors Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 01/13] media: v4l2-ioctl: Fix check_ext_ctrls Ricardo Ribalda
2021-03-17 10:36 ` Hans Verkuil
2021-03-16 17:59 ` Ricardo Ribalda [this message]
2021-03-16 17:59 ` [PATCH v5 03/13] media: uvcvideo: Return -EIO for control errors Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 04/13] media: uvcvideo: Check controls flags before accessing them Ricardo Ribalda
2021-03-17 10:50 ` Hans Verkuil
2021-03-16 17:59 ` [PATCH v5 05/13] media: uvcvideo: refactor __uvc_ctrl_add_mapping Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 06/13] media: uvcvideo: Add support for V4L2_CTRL_TYPE_CTRL_CLASS Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 07/13] media: uvcvideo: Use dev->name for querycap() Ricardo Ribalda
2021-03-17 10:57 ` Hans Verkuil
2021-03-16 17:59 ` [PATCH v5 08/13] media: uvcvideo: Set unique vdev name based in type Ricardo Ribalda
2021-03-16 17:59 ` [PATCH v5 09/13] media: uvcvideo: Increase the size of UVC_METADATA_BUF_SIZE Ricardo Ribalda
2021-03-17 11:01 ` Hans Verkuil
2021-03-16 18:00 ` [PATCH v5 10/13] media: uvcvideo: Return -EACCES to inactive controls Ricardo Ribalda
2021-03-17 11:26 ` Hans Verkuil
2021-03-16 18:00 ` [PATCH v5 11/13] media: uvcvideo: Use control names from framework Ricardo Ribalda
2021-03-17 11:29 ` Hans Verkuil
2021-03-16 18:00 ` [PATCH v5 12/13] media: v4l2-ioctl: Set error_idx to the right value Ricardo Ribalda
2021-03-17 11:39 ` Hans Verkuil
2021-03-16 18:00 ` [PATCH v5 13/13] uvc: use vb2 ioctl and fop helpers Ricardo Ribalda
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=20210316180004.1605727-3-ribalda@chromium.org \
--to=ribalda@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=tfiga@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).