summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2009-09-11 00:29:59 -0700
committerIliyan Malchev <malchev@google.com>2009-09-11 00:29:59 -0700
commit824201294b5f3c3ad6ca9d9751d96f78142c5409 (patch)
tree3cd835ddf5728d66c7f5724f613a09e8c165bcc6
parent4e57cf3f8c0b696f117579c8165b13c8d32b9b5d (diff)
downloadbionic-824201294b5f3c3ad6ca9d9751d96f78142c5409.zip
bionic-824201294b5f3c3ad6ca9d9751d96f78142c5409.tar.gz
bionic-824201294b5f3c3ad6ca9d9751d96f78142c5409.tar.bz2
bionic: update processed msm_camera.h
Signed-off-by: Iliyan Malchev <malchev@google.com>
-rw-r--r--libc/kernel/common/media/msm_camera.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h
index 6596d6b..9519861 100644
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -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