genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-09-06 23:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENGR00117261 V4L2 capture:CSI input cropping improvement

Browse Source 
1) When using CSI->MEM to capture frames, the output frame resolution of
   channel CSI->MEM should be the same with that of cropping input frame.
2) Enable to capture frames bigger than the cropped input frames.

Signed-off-by: Liu Ying <b17645@freescale.com>
(cherry picked from commit eee5a08306df7d9b1f23f463c9e9439e04293b57)
This commit is contained in:
Liu Ying
2009-10-26 15:56:42 -04:00
committed by Matt Sealey
parent 12c8a0fa58
commit fc1695fdec
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/media/video/mxc/capture/mxc_v4l2_capture.c
View File

@@ -674,18 +674,8 @@ static int mxc_v4l2_s_fmt(cam_data *cam, struct v4l2_format *f)
*/
if (strcmp(mxc_capture_inputs[cam->current_input].name,
"CSI MEM") == 0) {
f->fmt.pix.width = cam->crop_bounds.width;
f->fmt.pix.height = cam->crop_bounds.height;
}
/* Handle case where size requested is larger than cuurent
* camera setting. */
if ((f->fmt.pix.width > cam->crop_bounds.width)
|| (f->fmt.pix.height > cam->crop_bounds.height)) {
/* Need the logic here, calling vidioc_s_param if
* camera can change. */
/* For the moment, just return an error. */
return -EINVAL;
f->fmt.pix.width = cam->crop_current.width;
f->fmt.pix.height = cam->crop_current.height;
}
if (cam->rotation >= IPU_ROTATE_90_RIGHT) {
@@ -700,10 +690,10 @@ static int mxc_v4l2_s_fmt(cam_data *cam, struct v4l2_format *f)
*width -= *width % 8;
*height -= *height % 8;
if ((cam->crop_bounds.width / *width > 8) ||
((cam->crop_bounds.width / *width == 8) &&
(cam->crop_bounds.width % *width))) {
*width = cam->crop_bounds.width / 8;
if ((cam->crop_current.width / *width > 8) ||
((cam->crop_current.width / *width == 8) &&
(cam->crop_current.width % *width))) {
*width = cam->crop_current.width / 8;
if (*width % 8)
*width += 8 - *width % 8;
pr_err("ERROR: v4l2 capture: width exceeds limit "
@@ -711,10 +701,10 @@ static int mxc_v4l2_s_fmt(cam_data *cam, struct v4l2_format *f)
*width);
}
if ((cam->crop_bounds.height / *height > 8) ||
((cam->crop_bounds.height / *height == 8) &&
(cam->crop_bounds.height % *height))) {
*height = cam->crop_bounds.height / 8;
if ((cam->crop_current.height / *height > 8) ||
((cam->crop_current.height / *height == 8) &&
(cam->crop_current.height % *height))) {
*height = cam->crop_current.height / 8;
if (*height % 8)
*height += 8 - *height % 8;
pr_err("ERROR: v4l2 capture: height exceeds limit "
@@ -1143,6 +1133,13 @@ static int mxc_v4l2_s_param(cam_data *cam, struct v4l2_streamparm *parm)
cam->crop_bounds.width = cam_fmt.fmt.pix.width;
cam->crop_bounds.height = cam_fmt.fmt.pix.height;
/*
* Set the default current cropped resolution to be the same with
* the cropping boundary.
*/
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
* size of the image. */