Commit 11c635a2 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11870): gspca - main: VIDIOC_ENUM_FRAMESIZES ioctl added.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9fd6418a
...@@ -863,6 +863,32 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, ...@@ -863,6 +863,32 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
return ret; return ret;
} }
static int vidioc_enum_framesizes(struct file *file, void *priv,
struct v4l2_frmsizeenum *fsize)
{
struct gspca_dev *gspca_dev = priv;
int i;
__u32 index = 0;
for (i = 0; i < gspca_dev->cam.nmodes; i++) {
if (fsize->pixel_format !=
gspca_dev->cam.cam_mode[i].pixelformat)
continue;
if (fsize->index == index) {
fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
fsize->discrete.width =
gspca_dev->cam.cam_mode[i].width;
fsize->discrete.height =
gspca_dev->cam.cam_mode[i].height;
return 0;
}
index++;
}
return -EINVAL;
}
static void gspca_release(struct video_device *vfd) static void gspca_release(struct video_device *vfd)
{ {
struct gspca_dev *gspca_dev = container_of(vfd, struct gspca_dev, vdev); struct gspca_dev *gspca_dev = container_of(vfd, struct gspca_dev, vdev);
...@@ -1858,6 +1884,7 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = { ...@@ -1858,6 +1884,7 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = {
.vidioc_g_parm = vidioc_g_parm, .vidioc_g_parm = vidioc_g_parm,
.vidioc_s_parm = vidioc_s_parm, .vidioc_s_parm = vidioc_s_parm,
.vidioc_s_std = vidioc_s_std, .vidioc_s_std = vidioc_s_std,
.vidioc_enum_framesizes = vidioc_enum_framesizes,
#ifdef CONFIG_VIDEO_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
.vidiocgmbuf = vidiocgmbuf, .vidiocgmbuf = vidiocgmbuf,
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment