summaryrefslogtreecommitdiffstats
path: root/libc
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@qualcomm.com>2010-07-20 13:25:34 -0700
committerQuIC Gerrit Code Review <code-review@quicinc.com>2010-07-20 13:25:34 -0700
commit81c05ac2f01cc3b945f580080d868bf3ea9c5f93 (patch)
tree4ec42386727d47ce063f986cac57df57ab020d08 /libc
parent0e50250d3e3e3c68e82982ccd46cd7a0fb9411d3 (diff)
parent1535c39f6ad2c5bca7200f11bc49abf2b6f593a1 (diff)
downloadbionic-81c05ac2f01cc3b945f580080d868bf3ea9c5f93.zip
bionic-81c05ac2f01cc3b945f580080d868bf3ea9c5f93.tar.gz
bionic-81c05ac2f01cc3b945f580080d868bf3ea9c5f93.tar.bz2
Merge "bionic: Sony 12 MP Bayer sensor support." into froyoQ8650DTBCANLYA2020M7630AABBQVLZA0060B
Diffstat (limited to 'libc')
-rw-r--r--libc/kernel/common/media/msm_camera.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h
index 0ee7a1a..a7cc621 100644
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -342,10 +342,12 @@ struct msm_snapshot_pp_status {
#define SENSOR_PREVIEW_MODE 0
#define SENSOR_SNAPSHOT_MODE 1
#define SENSOR_RAW_SNAPSHOT_MODE 2
+#define SENSOR_VIDEO_120FPS_MODE 3
#define SENSOR_QTR_SIZE 0
#define SENSOR_FULL_SIZE 1
-#define SENSOR_INVALID_SIZE 2
+#define SENSOR_QVGA_SIZE 2
+#define SENSOR_INVALID_SIZE 3
#define CAMERA_EFFECT_OFF 0
#define CAMERA_EFFECT_MONO 1