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

camera: ipp memory size turn large when in 3Mega and 2Mega, ov2655 1.3Mega framerate switch 12fps for cts

Browse Source
This commit is contained in:
ddl
2012-02-13 16:46:57 +08:00
parent 4aa04aa8dc
commit ece4c831d6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-rk29/board-rk29-k97.c
View File

@@ -90,7 +90,7 @@
#define CONFIG_SENSOR_VGA_FPS_FIXED_0 12504
#define CONFIG_SENSOR_480P_FPS_FIXED_0 12504
#define CONFIG_SENSOR_SVGA_FPS_FIXED_0 12504
#define CONFIG_SENSOR_720P_FPS_FIXED_0 6256
#define CONFIG_SENSOR_720P_FPS_FIXED_0 12504
#ifdef CONFIG_SOC_CAMERA_OV9665
#define CONFIG_SENSOR_1 RK29_CAM_SENSOR_OV9665 /* front camera sensor */
#define CONFIG_SENSOR_IIC_ADDR_1 0x60
@@ -124,7 +124,7 @@
#define CONFIG_SENSOR_VGA_FPS_FIXED_1 12504
#define CONFIG_SENSOR_480P_FPS_FIXED_1 12504
#define CONFIG_SENSOR_SVGA_FPS_FIXED_1 12504
#define CONFIG_SENSOR_720P_FPS_FIXED_1 6256
#define CONFIG_SENSOR_720P_FPS_FIXED_1 12504
#endif //#ifdef CONFIG_VIDEO_RK29
/*---------------- Camera Sensor Configuration Macro End------------------------*/
#include "../../../drivers/media/video/rk29_camera.c"

2
drivers/media/video/ov2655.c
View File

@@ -372,7 +372,7 @@ static struct reginfo sensor_uxga[] =
static struct reginfo sensor_sxga[] =
{
{0x300E, 0x34},
{0x3011, 0x01},
{0x3011, 0x00},
{0x3012, 0x00},
{0x302a, 0x05},
{0x302b, 0xCB},

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

@@ -42,10 +42,10 @@
#define PMEM_CAMIPP_NECESSARY 0x800000
#elif (PMEM_CAM_FULL_RESOLUTION == 0x300000)
#define PMEM_CAM_NECESSARY 0xe00000 /* 1280*720*1.5*4(preview) + 4.5M(capture raw) + 3M(jpeg encode output) */
#define PMEM_CAMIPP_NECESSARY 0x500000
#define PMEM_CAMIPP_NECESSARY 0x600000
#elif (PMEM_CAM_FULL_RESOLUTION == 0x200000) /* 1280*720*1.5*4(preview) + 3M(capture raw) + 3M(jpeg encode output) */
#define PMEM_CAM_NECESSARY 0xc00000
#define PMEM_CAMIPP_NECESSARY 0x400000
#define PMEM_CAMIPP_NECESSARY 0x600000
#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) */
#define PMEM_CAMIPP_NECESSARY 0x400000