aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov7670.c
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2010-09-24 14:17:37 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:17:06 -0200
commitb0326b7f8de020d70487673123bc93138c091151 (patch)
tree0d602baa2d6502af3cd6abc571e3b55ac55a08b3 /drivers/media/video/ov7670.c
parente99dfcf7f68d8dffccfa795d1548790cee2d7395 (diff)
downloadkernel_samsung_smdk4412-b0326b7f8de020d70487673123bc93138c091151.zip
kernel_samsung_smdk4412-b0326b7f8de020d70487673123bc93138c091151.tar.gz
kernel_samsung_smdk4412-b0326b7f8de020d70487673123bc93138c091151.tar.bz2
[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>
Diffstat (limited to 'drivers/media/video/ov7670.c')
-rw-r--r--drivers/media/video/ov7670.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index ffccac5..a18dcd0 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 = {