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

camera: fix ov2659 delay 600ms after capture and pmem allocate for 0.3 Mega

Browse Source
This commit is contained in:
ddl
2011-07-19 11:16:15 +08:00
parent d2365ede31
commit 194bd0355a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/video/ov2659.c
View File

@@ -1898,6 +1898,7 @@ static int sensor_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
sensor_set_effect(icd, qctrl,sensor->info_priv.effect);
qctrl = soc_camera_find_qctrl(&sensor_ops, V4L2_CID_DO_WHITE_BALANCE);
sensor_set_whiteBalance(icd, qctrl,sensor->info_priv.whiteBalance);
msleep(600);
sensor->info_priv.video2preview = false;
sensor->info_priv.snap2preview = false;
}

6
drivers/media/video/rk29_camera.c
View File

@@ -45,7 +45,11 @@
#define PMEM_CAM_NECESSARY 0xc00000
#elif ((PMEM_CAM_FULL_RESOLUTION == 0x100000) || (PMEM_CAM_FULL_RESOLUTION == 0x130000))
#define PMEM_CAM_NECESSARY 0x800000 /* 800*600*1.5*4(preview) + 2M(capture raw) + 2M(jpeg encode output) */
#endif
#elif (PMEM_CAM_FULL_RESOLUTION == 0x30000)
#define PMEM_CAM_NECESSARY 0x400000 /* 640*480*1.5*4(preview) + 1M(capture raw) + 1M(jpeg encode output) */
#else
#define PMEM_CAM_NECESSARY 0x1200000
#endif
/*---------------- Camera Sensor Fixed Macro End ------------------------*/
#else //#ifdef CONFIG_VIDEO_RK29
#define PMEM_CAM_NECESSARY 0x00000000