shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera:arm_crop select wrong zone,fix it

Browse Source
This commit is contained in:
zyc
2013-02-02 13:31:47 +08:00
parent b161871924
commit e8aad52aa7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -1084,8 +1084,8 @@ static int rk_camera_scale_crop_arm(struct work_struct *work)
cropW = pcdev->zoominfo.a.c.width;
cropH = pcdev->zoominfo.a.c.height;
psY = psY + (srcW-cropW)/2;
psUV = psUV + (srcW-cropW)/2;
psY = psY + pcdev->zoominfo.a.c.top*pcdev->zoominfo.vir_width+pcdev->zoominfo.a.c.left;
psUV = psUV + pcdev->zoominfo.a.c.top*pcdev->zoominfo.vir_width/2+pcdev->zoominfo.a.c.left;
vb_info = pcdev->vbinfo+vb->i;
dst_phy = vb_info->phy_addr;
@@ -1094,9 +1094,8 @@ static int rk_camera_scale_crop_arm(struct work_struct *work)
dstW = pcdev->icd->user_width;
dstH = pcdev->icd->user_height;
zoomindstxIntInv = ((unsigned long)cropW<<16)/dstW + 1;
zoomindstyIntInv = ((unsigned long)cropH<<16)/dstH + 1;
zoomindstxIntInv = ((unsigned long)(cropW)<<16)/dstW + 1;
zoomindstyIntInv = ((unsigned long)(cropH)<<16)/dstH + 1;
//y
//for(y = 0; y<dstH - 1 ; y++ ) {
for(y = 0; y<dstH; y++ ) {
@@ -2090,6 +2089,7 @@ static int rk_camera_set_fmt(struct soc_camera_device *icd,
pcdev->host_width = usr_w;
pcdev->host_height = usr_h;
}
#else
//according to crop and scale capability to change , here just cropt to user needed
if (unlikely((mf.width <16) || (mf.width > 8190) || (mf.height < 16) || (mf.height > 8190))) {