Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] V4l: sh_mobile_ceu_camera: fix cropping offset calculation

Browse source 
Use the correct scales to calculate cropping offsets.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Guennadi Liakhovetski 2011-02-16 18:42:24 -03:00 committed by Mauro Carvalho Chehab
parent 379fa5d356
commit 787d0f9d5c
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/media/video/sh_mobile_ceu_camera.c
View file

@ -1348,7 +1348,7 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
struct device *dev = icd->dev.parent; struct device *dev = icd->dev.parent;
struct v4l2_mbus_framefmt mf; struct v4l2_mbus_framefmt mf;
unsigned int scale_cam_h, scale_cam_v, scale_ceu_h, scale_ceu_v, unsigned int scale_cam_h, scale_cam_v, scale_ceu_h, scale_ceu_v,
out_width, out_height, scale_h, scale_v; out_width, out_height;
int interm_width, interm_height; int interm_width, interm_height;
u32 capsr, cflcr; u32 capsr, cflcr;
int ret; int ret;
@ -1406,10 +1406,6 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
scale_ceu_h = calc_scale(interm_width, &out_width); scale_ceu_h = calc_scale(interm_width, &out_width);
scale_ceu_v = calc_scale(interm_height, &out_height); scale_ceu_v = calc_scale(interm_height, &out_height);
/* Calculate camera scales */
scale_h = calc_generic_scale(cam_rect->width, out_width);
scale_v = calc_generic_scale(cam_rect->height, out_height);
dev_geo(dev, "5: CEU scales %u:%u\n", scale_ceu_h, scale_ceu_v); dev_geo(dev, "5: CEU scales %u:%u\n", scale_ceu_h, scale_ceu_v);
/* Apply CEU scales. */ /* Apply CEU scales. */
@ -1421,8 +1417,8 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
icd->user_width = out_width; icd->user_width = out_width;
icd->user_height = out_height; icd->user_height = out_height;
cam->ceu_left = scale_down(rect->left - cam_rect->left, scale_h) & ~1; cam->ceu_left = scale_down(rect->left - cam_rect->left, scale_cam_h) & ~1;
cam->ceu_top = scale_down(rect->top - cam_rect->top, scale_v) & ~1; cam->ceu_top = scale_down(rect->top - cam_rect->top, scale_cam_v) & ~1;
/* 6. Use CEU cropping to crop to the new window. */ /* 6. Use CEU cropping to crop to the new window. */
sh_mobile_ceu_set_rect(icd); sh_mobile_ceu_set_rect(icd);
@ -1433,7 +1429,7 @@ static int sh_mobile_ceu_set_crop(struct soc_camera_device *icd,
icd->user_width, icd->user_height, icd->user_width, icd->user_height,
cam->ceu_left, cam->ceu_top); cam->ceu_left, cam->ceu_top);
/* Restore capture */ /* Restore capture. The CE bit can be cleared by the hardware */
if (pcdev->active) if (pcdev->active)
capsr |= 1; capsr |= 1;
capture_restore(pcdev, capsr); capture_restore(pcdev, capsr);