summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-08-25 16:46:53 +0200
committerGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-08-25 16:46:53 +0200
commit4eb5903e517a1d50a63f75fef61090f5f90b81ea (patch)
tree00f0f88bf68565a6acbdacc865142056b6353bd6 /linux/drivers
parentfee3ccfc8db428f3108858be9c73a4c28a618e4d (diff)
downloadmediapointer-dvb-s2-4eb5903e517a1d50a63f75fef61090f5f90b81ea.tar.gz
mediapointer-dvb-s2-4eb5903e517a1d50a63f75fef61090f5f90b81ea.tar.bz2
ov772x: do not use scaling for cropping
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> OV772x sensors cannot crop, they only support two fixed formats: VGA and QVGA. We should not change the format when requested to crop, only S_FMT can do this. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Priority: low --- drivers/media/video/ov772x.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-)
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/ov772x.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/linux/drivers/media/video/ov772x.c b/linux/drivers/media/video/ov772x.c
index 700f655fd..e8bb337da 100644
--- a/linux/drivers/media/video/ov772x.c
+++ b/linux/drivers/media/video/ov772x.c
@@ -955,23 +955,22 @@ ov772x_set_fmt_error:
return ret;
}
+/* Cannot crop, just return the current geometry */
static int ov772x_set_crop(struct soc_camera_device *icd,
struct v4l2_rect *rect)
{
struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
struct ov772x_priv *priv = to_ov772x(client);
- int ret;
- if (!priv->fmt)
+ if (!priv->fmt || !priv->win)
return -EINVAL;
- ret = ov772x_set_params(client, &rect->width, &rect->height,
- priv->fmt->fourcc);
- if (!ret) {
- rect->left = 0;
- rect->top = 0;
- }
- return ret;
+ rect->left = 0;
+ rect->top = 0;
+ rect->width = priv->win->width;
+ rect->height = priv->win->height;
+
+ return 0;
}
static int ov772x_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)