summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@qualcomm.com>2010-08-24 06:30:13 -0700
committerQuIC Gerrit Code Review <code-review@quicinc.com>2010-08-24 06:30:13 -0700
commit3de26d573de33af0f242df3ab03bc8fa5b30244e (patch)
tree56b63395ebfdcfcfbc619aa19176df2ac9f0fc28
parenta71ccde9e268205a3603763ba432a3b0098ddd6c (diff)
parent0c4f090a8eaec52830f7e47b98f62c968ba0cec6 (diff)
downloadbionic-3de26d573de33af0f242df3ab03bc8fa5b30244e.zip
bionic-3de26d573de33af0f242df3ab03bc8fa5b30244e.tar.gz
bionic-3de26d573de33af0f242df3ab03bc8fa5b30244e.tar.bz2
Merge "camera: Live snapshot feature" into froyo
-rw-r--r--libc/kernel/common/media/msm_camera.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/libc/kernel/common/media/msm_camera.h b/libc/kernel/common/media/msm_camera.h
index b1d4b3b..5a07ac9 100644
--- a/libc/kernel/common/media/msm_camera.h
+++ b/libc/kernel/common/media/msm_camera.h
@@ -279,10 +279,11 @@ struct outputCfg {
#define MSM_FRAME_PREV_2 1
#define MSM_FRAME_ENC 2
-#define OUTPUT_TYPE_P 1
-#define OUTPUT_TYPE_T 2
-#define OUTPUT_TYPE_S 3
-#define OUTPUT_TYPE_V 4
+#define OUTPUT_TYPE_P (1<<0)
+#define OUTPUT_TYPE_T (1<<1)
+#define OUTPUT_TYPE_S (1<<2)
+#define OUTPUT_TYPE_V (1<<3)
+#define OUTPUT_TYPE_L (1<<4)
struct msm_frame {
struct timespec ts;