diff options
Diffstat (limited to 'camera/include/linux/s5c73m3.h')
| -rw-r--r-- | camera/include/linux/s5c73m3.h | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/camera/include/linux/s5c73m3.h b/camera/include/linux/s5c73m3.h index d2e57d5..ffb582e 100644 --- a/camera/include/linux/s5c73m3.h +++ b/camera/include/linux/s5c73m3.h @@ -64,41 +64,33 @@ enum s5c73m3_fw_path{ }; enum s5c73m3_prev_frmsize { - S5C73M3_PREVIEW_QCIF, - S5C73M3_PREVIEW_QCIF2, S5C73M3_PREVIEW_QVGA, S5C73M3_PREVIEW_CIF, S5C73M3_PREVIEW_VGA, S5C73M3_PREVIEW_D1, - S5C73M3_PREVIEW_WVGA, - S5C73M3_PREVIEW_704X576, + S5C73M3_PREVIEW_800X600, S5C73M3_PREVIEW_880X720, - S5C73M3_PREVIEW_960X640, S5C73M3_PREVIEW_960X720, S5C73M3_PREVIEW_1008X672, - S5C73M3_PREVIEW_1056X704, S5C73M3_PREVIEW_1184X666, S5C73M3_PREVIEW_720P, + S5C73M3_PREVIEW_1280X960, S5C73M3_VDIS_720P, S5C73M3_PREVIEW_1080P, S5C73M3_VDIS_1080P, - S5C73M3_PREVIEW_HDR, }; enum s5c73m3_cap_frmsize { S5C73M3_CAPTURE_VGA, /* 640 x 480 */ - S5C73M3_CAPTURE_WVGA, /* 800 x 480 */ + S5C73M3_CAPTURE_960x540, /* 960 x 540 */ + S5C73M3_CAPTURE_960x720, /* 960 x 720 */ S5C73M3_CAPTURE_1024X768, /* 1024 x 768 */ S5C73M3_CAPTURE_HD, /* 1280 x 720 */ - S5C73M3_CAPTURE_W1MP, /* 1600 x 960 */ S5C73M3_CAPTURE_2MP, /* UXGA - 1600 x 1200 */ S5C73M3_CAPTURE_W2MP, /* 2048 x 1232 */ S5C73M3_CAPTURE_3MP, /* QXGA - 2048 x 1536 */ - S5C73M3_CAPTURE_W4MP, /* WQXGA - 2560 x 1536 */ S5C73M3_CAPTURE_5MP, /* 2560 x 1920 */ S5C73M3_CAPTURE_W6MP, /* 3072 x 1856 */ - S5C73M3_CAPTURE_7MP, /* 3072 x 2304 */ - S5C73M3_CAPTURE_W7MP, /* WQXGA - 2560 x 1536 */ S5C73M3_CAPTURE_3264X2176, /* 3264 x 2176 */ S5C73M3_CAPTURE_8MP, /* 3264 x 2448 */ }; @@ -144,6 +136,7 @@ enum s5c73m3_isneed_flash_tristate { #define S5C73M3_IMAGE_EFFECT_POINT_RED_YELLOW 0x000D #define S5C73M3_IMAGE_EFFECT_POINT_COLOR_3 0x000E #define S5C73M3_IMAGE_EFFECT_POINT_GREEN 0x000F +#define S5C73M3_IMAGE_EFFECT_CARTOONIZE 0x001A #define S5C73M3_IMAGE_QUALITY 0x0B0C #define S5C73M3_IMAGE_QUALITY_SUPERFINE 0x0000 @@ -166,9 +159,9 @@ enum s5c73m3_isneed_flash_tristate { #define S5C73M3_CHG_MODE 0x0B10 -#define S5C73M3_YUV_MODE 0x8000 -#define S5C73M3_INTERLEAVED_MODE 0x8000 - +#define S5C73M3_DEFAULT_MODE 0x8000 +#define S5C73M3_FAST_MODE_SUBSAMPLING_HALF 0xA000 +#define S5C73M3_FAST_MODE_SUBSAMPLING_QUARTER 0xC000 #define S5C73M3_AF_CON 0x0E00 #define S5C73M3_AF_CON_STOP 0x0000 @@ -262,9 +255,11 @@ enum s5c73m3_isneed_flash_tristate { #define S5C73M3_FIXED_30FPS 0x0002 #define S5C73M3_FIXED_20FPS 0x0003 #define S5C73M3_FIXED_15FPS 0x0004 +#define S5C73M3_FIXED_60FPS 0x0007 #define S5C73M3_FIXED_120FPS 0x0008 #define S5C73M3_FIXED_7FPS 0x0009 #define S5C73M3_FIXED_10FPS 0x000A +#define S5C73M3_FIXED_90FPS 0x000B #define S5C73M3_ANTI_SHAKE 0x0013 #define S5C73M3_SHARPNESS 0x0C14 @@ -303,10 +298,13 @@ enum s5c73m3_isneed_flash_tristate { #define S5C73M3_SCENE_MODE_FIRE 0x000B #define S5C73M3_SCENE_MODE_TEXT 0x000C #define S5C73M3_SCENE_MODE_CANDLE 0x000D +#define S5C73M3_SCENE_MODE_LOW_LIGHT 0x0020 #define S5C73M3_FIREWORK_CAPTURE 0x0C20 #define S5C73M3_NIGHTSHOT_CAPTURE 0x0C22 +#define S5C73M3_AE_LOW_LIGHT_MODE 0x0C2C + #define S5C73M3_AE_AUTO_BRAKET 0x0B14 #define S5C73M3_AE_AUTO_BRAKET_EV05 0x0080 #define S5C73M3_AE_AUTO_BRAKET_EV10 0x0100 |