diff options
| author | Miao Yu <r65093@freescale.com> | 2009-12-08 15:27:26 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-02-12 17:19:44 +0100 |
| commit | d3298fb40dc2b3b836ba371e486f09850a5c174b (patch) | |
| tree | 6c57a34289d65841160012ede7c3bec2079db535 /drivers/media/video | |
| parent | 72aa3c4c0e11f187824acc5c7a02e85bf41feab6 (diff) | |
ENGR00119069 V4L2 capture: Do not change current crop setting for tvin.
There is one CSI crop improvement (engr117261) in v4l2 capture.
But the improvement is not suitable for tvin module since the
ACT_FRM_SIZE wouldn't be the same with the SENSOR_SIZE.
Signed-off-by: Miao Yu <r65093@freescale.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/mxc/capture/mxc_v4l2_capture.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c index edbd2ca606d1..9d69219b06c1 100644 --- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c @@ -1135,10 +1135,12 @@ static int mxc_v4l2_s_param(cam_data *cam, struct v4l2_streamparm *parm) /* * Set the default current cropped resolution to be the same with - * the cropping boundary. + * the cropping boundary(except for tvin module). */ - cam->crop_current.width = cam->crop_bounds.width; - cam->crop_current.height = cam->crop_bounds.height; + if (cam->device_type != 1) { + cam->crop_current.width = cam->crop_bounds.width; + cam->crop_current.height = cam->crop_bounds.height; + } /* This essentially loses the data at the left and bottom of the image * giving a digital zoom image, if crop_current is less than the full |