summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2012-11-27 01:22:13 +0100
committercodeworkx <codeworkx@cyanogenmod.org>2012-11-27 01:22:13 +0100
commit2eec3d39eed9f116a4dded5e39eff2a6f04a337d (patch)
tree998ca64583ce93c980b5204401f5f9a8fdeea570 /camera
parentaa01a15ff23d0d7b33956a0bbbbf29ce5c53b0ec (diff)
downloadframeworks_av-2eec3d39eed9f116a4dded5e39eff2a6f04a337d.zip
frameworks_av-2eec3d39eed9f116a4dded5e39eff2a6f04a337d.tar.gz
frameworks_av-2eec3d39eed9f116a4dded5e39eff2a6f04a337d.tar.bz2
camera: add parameters for samsung cameras
From: codeworkx <codeworkx@cyanogenmod.com> Date: Sat, 22 Sep 2012 11:36:26 +0200 Subject: [PATCH] camera: added weather key for samsung cameras Change-Id: I1c6dc38f548fb3087abbdf7d7f83c39afaa217a1 --- From: Steve Kondik <shade@chemlab.org> Date: Tue, 15 May 2012 09:41:02 -0700 Subject: [PATCH] camera: Add parameters for some Samsung cameras * Enable with SAMSUNG_CAMERA_HARDWARE * Adds anti-shake, metering, and wdr modes. Change-Id: I080c90e11fcb8fa48900c01a454868f173f61eb0 ---
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index fd91bf2..90250ea 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -91,6 +91,13 @@ const char CameraParameters::KEY_VIDEO_SNAPSHOT_SUPPORTED[] = "video-snapshot-su
const char CameraParameters::KEY_VIDEO_STABILIZATION[] = "video-stabilization";
const char CameraParameters::KEY_VIDEO_STABILIZATION_SUPPORTED[] = "video-stabilization-supported";
+#ifdef SAMSUNG_CAMERA_HARDWARE
+const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "anti-shake";
+const char CameraParameters::KEY_METERING[] = "metering";
+const char CameraParameters::KEY_WDR[] = "wdr";
+const char CameraParameters::KEY_WEATHER[] = "weather";
+#endif
+
const char CameraParameters::TRUE[] = "true";
const char CameraParameters::FALSE[] = "false";
const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";