* [PATCH] stkwebcam: Implement VIDIOC_ENUM_FRAMESIZES ioctl
@ 2008-12-08 18:10 Jaime Velasco Juan
2008-12-08 18:33 ` Hans Verkuil
0 siblings, 1 reply; 4+ messages in thread
From: Jaime Velasco Juan @ 2008-12-08 18:10 UTC (permalink / raw)
To: mchehab; +Cc: video4linux-list
It is used at least by gstreamer.
Signed-off-by: Jaime Velasco Juan <jsagarribay@gmail.com>
---
drivers/media/video/stk-webcam.c | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index e9eb6d7..4afa82f 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -1262,6 +1262,34 @@ static int stk_vidioc_g_parm(struct file *filp,
return 0;
}
+static int stk_vidioc_enum_framesizes(struct file *filp,
+ void *priv, struct v4l2_frmsizeenum *frms)
+{
+ if (frms->index >= ARRAY_SIZE(stk_sizes))
+ return -EINVAL;
+ switch (frms->pixel_format) {
+ case V4L2_PIX_FMT_RGB565:
+ case V4L2_PIX_FMT_RGB565X:
+ case V4L2_PIX_FMT_UYVY:
+ case V4L2_PIX_FMT_YUYV:
+ case V4L2_PIX_FMT_SBGGR8:
+ frms->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+ frms->discrete.width = stk_sizes[frms->index].w;
+ frms->discrete.height = stk_sizes[frms->index].h;
+ return 0;
+ default: return -EINVAL;
+ }
+}
+
+static int stk_vidioc_default(struct file *filp,
+ void *priv, int cmd, void *arg)
+{
+ if (cmd == (int)VIDIOC_ENUM_FRAMESIZES)
+ return stk_vidioc_enum_framesizes(filp, priv,
+ (struct v4l2_frmsizeenum *) arg);
+ return -EINVAL;
+}
+
static struct file_operations v4l_stk_fops = {
.owner = THIS_MODULE,
.open = v4l_stk_open,
@@ -1296,6 +1324,7 @@ static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = {
.vidioc_g_ctrl = stk_vidioc_g_ctrl,
.vidioc_s_ctrl = stk_vidioc_s_ctrl,
.vidioc_g_parm = stk_vidioc_g_parm,
+ .vidioc_default = stk_vidioc_default,
};
static void stk_v4l_dev_release(struct video_device *vd)
--
1.5.6.5
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] stkwebcam: Implement VIDIOC_ENUM_FRAMESIZES ioctl
2008-12-08 18:10 [PATCH] stkwebcam: Implement VIDIOC_ENUM_FRAMESIZES ioctl Jaime Velasco Juan
@ 2008-12-08 18:33 ` Hans Verkuil
2008-12-09 17:34 ` [PATCH v2] " Jaime Velasco Juan
0 siblings, 1 reply; 4+ messages in thread
From: Hans Verkuil @ 2008-12-08 18:33 UTC (permalink / raw)
To: video4linux-list; +Cc: mchehab
On Monday 08 December 2008 19:10:26 Jaime Velasco Juan wrote:
> It is used at least by gstreamer.
Thanks Jaime!
But can you redo this against the v4l-dvb repository?
(www.linuxtv.org/hg/v4l-dvb)
That already contains a proper v4l2_ioctl_ops function for this
enum_framesizes ioctl. That way you do not need to use vidioc_default.
Thanks,
Hans
> Signed-off-by: Jaime Velasco Juan <jsagarribay@gmail.com>
> ---
> drivers/media/video/stk-webcam.c | 29
> +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0
> deletions(-)
>
> diff --git a/drivers/media/video/stk-webcam.c
> b/drivers/media/video/stk-webcam.c index e9eb6d7..4afa82f 100644
> --- a/drivers/media/video/stk-webcam.c
> +++ b/drivers/media/video/stk-webcam.c
> @@ -1262,6 +1262,34 @@ static int stk_vidioc_g_parm(struct file
> *filp, return 0;
> }
>
> +static int stk_vidioc_enum_framesizes(struct file *filp,
> + void *priv, struct v4l2_frmsizeenum *frms)
> +{
> + if (frms->index >= ARRAY_SIZE(stk_sizes))
> + return -EINVAL;
> + switch (frms->pixel_format) {
> + case V4L2_PIX_FMT_RGB565:
> + case V4L2_PIX_FMT_RGB565X:
> + case V4L2_PIX_FMT_UYVY:
> + case V4L2_PIX_FMT_YUYV:
> + case V4L2_PIX_FMT_SBGGR8:
> + frms->type = V4L2_FRMSIZE_TYPE_DISCRETE;
> + frms->discrete.width = stk_sizes[frms->index].w;
> + frms->discrete.height = stk_sizes[frms->index].h;
> + return 0;
> + default: return -EINVAL;
> + }
> +}
> +
> +static int stk_vidioc_default(struct file *filp,
> + void *priv, int cmd, void *arg)
> +{
> + if (cmd == (int)VIDIOC_ENUM_FRAMESIZES)
> + return stk_vidioc_enum_framesizes(filp, priv,
> + (struct v4l2_frmsizeenum *) arg);
> + return -EINVAL;
> +}
> +
> static struct file_operations v4l_stk_fops = {
> .owner = THIS_MODULE,
> .open = v4l_stk_open,
> @@ -1296,6 +1324,7 @@ static const struct v4l2_ioctl_ops
> v4l_stk_ioctl_ops = { .vidioc_g_ctrl = stk_vidioc_g_ctrl,
> .vidioc_s_ctrl = stk_vidioc_s_ctrl,
> .vidioc_g_parm = stk_vidioc_g_parm,
> + .vidioc_default = stk_vidioc_default,
> };
>
> static void stk_v4l_dev_release(struct video_device *vd)
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2] stkwebcam: Implement VIDIOC_ENUM_FRAMESIZES ioctl
2008-12-08 18:33 ` Hans Verkuil
@ 2008-12-09 17:34 ` Jaime Velasco Juan
2008-12-25 10:04 ` [PATCH v2 - RESEND] " Jaime Velasco Juan
0 siblings, 1 reply; 4+ messages in thread
From: Jaime Velasco Juan @ 2008-12-09 17:34 UTC (permalink / raw)
To: Hans Verkuil, mchehab; +Cc: video4linux-list
It is used at least by gstreamer.
Signed-off-by: Jaime Velasco Juan <jsagarribay@gmail.com>
---
drivers/media/video/stk-webcam.c | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
Here is a new version of the patch using the vidioc_enum_framesizes callback.
Thanks for your comments, Hans.
Regards
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index e9eb6d7..5566c23 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -1262,6 +1262,25 @@ static int stk_vidioc_g_parm(struct file *filp,
return 0;
}
+static int stk_vidioc_enum_framesizes(struct file *filp,
+ void *priv, struct v4l2_frmsizeenum *frms)
+{
+ if (frms->index >= ARRAY_SIZE(stk_sizes))
+ return -EINVAL;
+ switch (frms->pixel_format) {
+ case V4L2_PIX_FMT_RGB565:
+ case V4L2_PIX_FMT_RGB565X:
+ case V4L2_PIX_FMT_UYVY:
+ case V4L2_PIX_FMT_YUYV:
+ case V4L2_PIX_FMT_SBGGR8:
+ frms->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+ frms->discrete.width = stk_sizes[frms->index].w;
+ frms->discrete.height = stk_sizes[frms->index].h;
+ return 0;
+ default: return -EINVAL;
+ }
+}
+
static struct file_operations v4l_stk_fops = {
.owner = THIS_MODULE,
.open = v4l_stk_open,
@@ -1296,6 +1315,7 @@ static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = {
.vidioc_g_ctrl = stk_vidioc_g_ctrl,
.vidioc_s_ctrl = stk_vidioc_s_ctrl,
.vidioc_g_parm = stk_vidioc_g_parm,
+ .vidioc_enum_framesizes = stk_vidioc_enum_framesizes,
};
static void stk_v4l_dev_release(struct video_device *vd)
--
1.5.6.5
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 - RESEND] stkwebcam: Implement VIDIOC_ENUM_FRAMESIZES ioctl
2008-12-09 17:34 ` [PATCH v2] " Jaime Velasco Juan
@ 2008-12-25 10:04 ` Jaime Velasco Juan
0 siblings, 0 replies; 4+ messages in thread
From: Jaime Velasco Juan @ 2008-12-25 10:04 UTC (permalink / raw)
To: mchehab; +Cc: video4linux-list
This patch implements VIDIOC_ENUM_FRAMESIZES, it is used at least
by gstreamer.
Signed-off-by: Jaime Velasco Juan <jsagarribay@gmail.com>
---
drivers/media/video/stk-webcam.c | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
Hi Mauro, could you please apply this patch?
Regards
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index e9eb6d7..5566c23 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -1262,6 +1262,25 @@ static int stk_vidioc_g_parm(struct file *filp,
return 0;
}
+static int stk_vidioc_enum_framesizes(struct file *filp,
+ void *priv, struct v4l2_frmsizeenum *frms)
+{
+ if (frms->index >= ARRAY_SIZE(stk_sizes))
+ return -EINVAL;
+ switch (frms->pixel_format) {
+ case V4L2_PIX_FMT_RGB565:
+ case V4L2_PIX_FMT_RGB565X:
+ case V4L2_PIX_FMT_UYVY:
+ case V4L2_PIX_FMT_YUYV:
+ case V4L2_PIX_FMT_SBGGR8:
+ frms->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+ frms->discrete.width = stk_sizes[frms->index].w;
+ frms->discrete.height = stk_sizes[frms->index].h;
+ return 0;
+ default: return -EINVAL;
+ }
+}
+
static struct file_operations v4l_stk_fops = {
.owner = THIS_MODULE,
.open = v4l_stk_open,
@@ -1296,6 +1315,7 @@ static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = {
.vidioc_g_ctrl = stk_vidioc_g_ctrl,
.vidioc_s_ctrl = stk_vidioc_s_ctrl,
.vidioc_g_parm = stk_vidioc_g_parm,
+ .vidioc_enum_framesizes = stk_vidioc_enum_framesizes,
};
static void stk_v4l_dev_release(struct video_device *vd)
--
1.5.6.5
--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-12-25 10:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-08 18:10 [PATCH] stkwebcam: Implement VIDIOC_ENUM_FRAMESIZES ioctl Jaime Velasco Juan
2008-12-08 18:33 ` Hans Verkuil
2008-12-09 17:34 ` [PATCH v2] " Jaime Velasco Juan
2008-12-25 10:04 ` [PATCH v2 - RESEND] " Jaime Velasco Juan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox