diff options
| author | Daniel Drake <dsd@laptop.org> | 2010-09-24 19:17:37 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 05:17:06 +0200 |
| commit | b0326b7f8de020d70487673123bc93138c091151 (patch) | |
| tree | 0d602baa2d6502af3cd6abc571e3b55ac55a08b3 | |
| parent | [media] ov7670: implement VIDIOC_ENUM_FRAMEINTERVALS (diff) | |
| download | linux-b0326b7f8de020d70487673123bc93138c091151.tar.xz linux-b0326b7f8de020d70487673123bc93138c091151.zip | |
[media] ov7670: implement VIDIOC_ENUM_FRAMESIZES
GStreamer uses this.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/ov7670.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index ffccac5c2d75..a18dcd05087b 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c @@ -907,6 +907,22 @@ static int ov7670_enum_frameintervals(struct v4l2_subdev *sd, } /* + * Frame size enumeration + */ +static int ov7670_enum_framesizes(struct v4l2_subdev *sd, + struct v4l2_frmsizeenum *fsize) +{ + __u32 index = fsize->index; + if (index >= N_WIN_SIZES) + return -EINVAL; + + fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE; + fsize->discrete.width = ov7670_win_sizes[index].width; + fsize->discrete.height = ov7670_win_sizes[index].height; + return 0; +} + +/* * Code for dealing with controls. */ @@ -1453,6 +1469,7 @@ static const struct v4l2_subdev_video_ops ov7670_video_ops = { .s_parm = ov7670_s_parm, .g_parm = ov7670_g_parm, .enum_frameintervals = ov7670_enum_frameintervals, + .enum_framesizes = ov7670_enum_framesizes, }; static const struct v4l2_subdev_ops ov7670_ops = { |