The patch number 9978 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[email protected]
------
From: Jaime Velasco Juan <[email protected]>
stkwebcam: Implement VIDIOC_ENUM_FRAMESIZES ioctl
This patch implements VIDIOC_ENUM_FRAMESIZES, it is used at least
by gstreamer.
Signed-off-by: Jaime Velasco Juan <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/video/stk-webcam.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff -r cae6de452897 -r e751f8ee19ea linux/drivers/media/video/stk-webcam.c
--- a/linux/drivers/media/video/stk-webcam.c Fri Dec 26 08:07:39 2008 -0200
+++ b/linux/drivers/media/video/stk-webcam.c Thu Dec 25 10:04:52 2008 +0000
@@ -1263,6 +1263,25 @@ static int stk_vidioc_g_parm(struct file
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,
@@ -1297,6 +1316,7 @@ static const struct v4l2_ioctl_ops v4l_s
.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)
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/e751f8ee19ea799cca7aa7cf0ae014a9c2e973eb
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
