diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-11-15 12:05:31 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-11-15 12:05:31 -0800 |
| commit | 95604529ec25fe7923ba88312c590f38aa5e3d9e (patch) | |
| tree | c6f1dd860fcdc273ab21b696778987261f6e4fa8 /libc/kernel/common/media/msm_camera.h | |
| parent | 71c0aeb44f2301af85d6a370dbd7308602a1dfe0 (diff) | |
| parent | 194d3fa048cf909ca592dd56fa538dc9cd3f5ddb (diff) | |
| download | bionic-95604529ec25fe7923ba88312c590f38aa5e3d9e.zip bionic-95604529ec25fe7923ba88312c590f38aa5e3d9e.tar.gz bionic-95604529ec25fe7923ba88312c590f38aa5e3d9e.tar.bz2 | |
merge from eclair
Diffstat (limited to 'libc/kernel/common/media/msm_camera.h')
| -rw-r--r-- | libc/kernel/common/media/msm_camera.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h index 6596d6b..a0b4a24 100644 --- a/libc/kernel/common/media/msm_camera.h +++ b/libc/kernel/common/media/msm_camera.h @@ -54,9 +54,9 @@ #define MSM_CAM_IOCTL_SET_CROP _IOW(MSM_CAM_IOCTL_MAGIC, 18, struct crop_info *) -#define MSM_CAM_IOCTL_PICT_PP _IOW(MSM_CAM_IOCTL_MAGIC, 19, uint8_t *) +#define MSM_CAM_IOCTL_PP _IOW(MSM_CAM_IOCTL_MAGIC, 19, uint8_t *) -#define MSM_CAM_IOCTL_PICT_PP_DONE _IOW(MSM_CAM_IOCTL_MAGIC, 20, struct msm_snapshot_pp_status *) +#define MSM_CAM_IOCTL_PP_DONE _IOW(MSM_CAM_IOCTL_MAGIC, 20, struct msm_snapshot_pp_status *) #define MSM_CAM_IOCTL_SENSOR_IO_CFG _IOW(MSM_CAM_IOCTL_MAGIC, 21, struct sensor_cfg_data *) @@ -73,6 +73,11 @@ #define MAX_SENSOR_NUM 3 #define MAX_SENSOR_NAME 32 +#define PP_SNAP 1 +#define PP_RAW_SNAP (1<<1) +#define PP_PREV (1<<2) +#define PP_MASK (PP_SNAP|PP_RAW_SNAP|PP_PREV) + #define MSM_CAM_CTRL_CMD_DONE 0 #define MSM_CAM_SENSOR_VFE_CMD 1 @@ -130,11 +135,12 @@ struct msm_camera_cfg_cmd { #define CMD_SNAP_BUF_RELEASE 11 #define CMD_SNAP_BUF_CFG 12 #define CMD_STATS_DISABLE 13 -#define CMD_STATS_ENABLE 14 +#define CMD_STATS_AEC_AWB_ENABLE 14 #define CMD_STATS_AF_ENABLE 15 #define CMD_STATS_BUF_RELEASE 16 #define CMD_STATS_AF_BUF_RELEASE 17 -#define UPDATE_STATS_INVALID 18 +#define CMD_STATS_ENABLE 18 +#define UPDATE_STATS_INVALID 19 struct msm_vfe_cfg_cmd { int cmd_type; @@ -150,7 +156,7 @@ struct camera_enable_cmd { #define MSM_PMEM_OUTPUT1 0 #define MSM_PMEM_OUTPUT2 1 #define MSM_PMEM_OUTPUT1_OUTPUT2 2 -#define MSM_PMEM_THUMBAIL 3 +#define MSM_PMEM_THUMBNAIL 3 #define MSM_PMEM_MAINIMG 4 #define MSM_PMEM_RAW_MAINIMG 5 #define MSM_PMEM_AEC_AWB 6 |