summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmerson Pinter <dev@pinter.com.br>2012-11-27 19:52:52 -0200
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2013-01-08 20:56:44 -0800
commit9ae164902eabbc9b3cebd35cf55b48cbb8dce1a3 (patch)
treee67c2cf79699bf6cf6cb9d51039236da6792a49f
parentc21437db470040195690eb29a0d6865914cc9d43 (diff)
downloadframeworks_av-9ae164902eabbc9b3cebd35cf55b48cbb8dce1a3.zip
frameworks_av-9ae164902eabbc9b3cebd35cf55b48cbb8dce1a3.tar.gz
frameworks_av-9ae164902eabbc9b3cebd35cf55b48cbb8dce1a3.tar.bz2
camera: add power mode support
Based on commit 7036d66bec7697160ba1b2e255f1e7fae0c8c435 from CAF, branch ics_chocolate. Change-Id: I652d63c33db9a8da4a9f8f613be12877d032de37
-rw-r--r--camera/CameraParameters.cpp7
-rw-r--r--include/camera/CameraParameters.h7
2 files changed, 14 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 51366ad..bfe756c 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -138,6 +138,10 @@ const char CameraParameters::KEY_SUPPORTED_ZSL_MODES[] = "zsl-values";
const char CameraParameters::KEY_CAMERA_MODE[] = "camera-mode";
#endif
const char CameraParameters::KEY_AE_BRACKET_HDR[] = "ae-bracket-hdr";
+
+const char CameraParameters::KEY_POWER_MODE[] = "power-mode";
+const char CameraParameters::KEY_POWER_MODE_SUPPORTED[] = "power-mode-supported";
+
/*only effective when KEY_AE_BRACKET_HDR set to ae_bracketing*/
//const char CameraParameters::KEY_AE_BRACKET_SETTING_KEY[] = "ae-bracket-setting";
@@ -350,6 +354,9 @@ const char CameraParameters::AE_BRACKET_HDR_OFF[] = "Off";
const char CameraParameters::AE_BRACKET_HDR[] = "HDR";
const char CameraParameters::AE_BRACKET[] = "AE-Bracket";
+const char CameraParameters::LOW_POWER[] = "Low_Power";
+const char CameraParameters::NORMAL_POWER[] = "Normal_Power";
+
static const char* portrait = "portrait";
static const char* landscape = "landscape";
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index bd9efc2..bf792a4 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -568,6 +568,7 @@ public:
// Example value: "true" or "false". Read only.
static const char KEY_VIDEO_SNAPSHOT_SUPPORTED[];
static const char KEY_FULL_VIDEO_SNAP_SUPPORTED[];
+ static const char KEY_POWER_MODE_SUPPORTED[];
#ifdef QCOM_HARDWARE
static const char KEY_ISO_MODE[];
@@ -603,6 +604,8 @@ public:
static const char KEY_MEMORY_COLOR_ENHANCEMENT[];
static const char KEY_SUPPORTED_MEM_COLOR_ENHANCE_MODES[];
+ static const char KEY_POWER_MODE[];
+
static const char KEY_ZSL[];
static const char KEY_SUPPORTED_ZSL_MODES[];
@@ -883,6 +886,10 @@ public:
static const char AE_BRACKET_HDR[];
static const char AE_BRACKET[];
+ //POWER MODE
+ static const char LOW_POWER[];
+ static const char NORMAL_POWER[];
+
// Values for HFR settings.
static const char VIDEO_HFR_OFF[];
static const char VIDEO_HFR_2X[];