summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmack <alali48@gmail.com>2013-08-18 10:22:48 -0400
committermadmack <alali48@gmail.com>2013-08-18 12:25:31 -0400
commit8f9411647f9c6b4836dc67f0e2e7bb86948f71ee (patch)
tree0dfc6c818958d6d6b06079dafafc2cbe28a4752b
parentabf3ce339d9ec6c162d742c71da372ab77fb966e (diff)
downloadframeworks_av-8f9411647f9c6b4836dc67f0e2e7bb86948f71ee.zip
frameworks_av-8f9411647f9c6b4836dc67f0e2e7bb86948f71ee.tar.gz
frameworks_av-8f9411647f9c6b4836dc67f0e2e7bb86948f71ee.tar.bz2
Add LG camera HAL parameters
Change-Id: I0a1d8c4216654abeb3de9882637ad15bc9c23dc9
-rw-r--r--camera/CameraParameters.cpp23
-rw-r--r--include/camera/CameraParameters.h23
2 files changed, 46 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 6320357..fd3029d 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -232,6 +232,29 @@ const char CameraParameters::KEY_GPU_EFFECT_PARAM_3[] = "GE-param3";
const char CameraParameters::KEY_FORCE_USE_AUDIO_ENABLED[] = "forceuseaudio";
#endif
+#ifdef LG_CAMERA_HARDWARE
+const char CameraParameters::AUDIO_ZOOM_OFF[] = "audio-zoom";
+const char CameraParameters::AUDIO_ZOOM_ON[] = "audio-zoom";
+const char CameraParameters::BEAUTY_SHOT_OFF[] = "beauty-shot";
+const char CameraParameters::BEAUTY_SHOT_ON[] = "beauty-shot";
+const char CameraParameters::BURST_SHOT_OFF[] = "burst-shot";
+const char CameraParameters::BURST_SHOT_ON[] = "burst-shot";
+const char CameraParameters::KEY_AUDIO_ZOOM[] = "audio-zoom";
+const char CameraParameters::KEY_AUDIO_ZOOM_SUPPORTED[] = "audio-zoom-supported";
+const char CameraParameters::KEY_BEAUTY_SHOT[] = "beauty-shot";
+const char CameraParameters::KEY_BEAUTY_SHOT_SUPPORTED[] = "beauty-shot-supported";
+const char CameraParameters::KEY_BURST_SHOT[] = "burst-shot";
+const char CameraParameters::KEY_BURST_SHOT_SUPPORTED[] = "burst-shot-supported";
+const char CameraParameters::KEY_FOCUS_MODE_OBJECT_TRACKING[] = "object-tracking";
+const char CameraParameters::KEY_FOCUS_MODE_OBJECT_TRACKING_SUPPORTED[] = "object-tracking-supported";
+const char CameraParameters::KEY_VIDEO_WDR[] = "video-wdr";
+const char CameraParameters::KEY_VIDEO_WDR_SUPPORTED[] = "video-wdr-supported";
+const char CameraParameters::VIDEO_WDR_OFF[] = "video-wdr";
+const char CameraParameters::VIDEO_WDR_ON[] = "video-wdr";
+const char CameraParameters::OBJECT_TRACKING_ON[] = "object-tracking";
+const char CameraParameters::OBJECT_TRACKING_OFF[] = "object-tracking";
+#endif
+
const char CameraParameters::TRUE[] = "true";
const char CameraParameters::FALSE[] = "false";
const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 696d5d2..4b0d008 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -698,6 +698,29 @@ public:
static const char KEY_FORCE_USE_AUDIO_ENABLED[];
#endif
+#ifdef LG_CAMERA_HARDWARE
+ static const char AUDIO_ZOOM_OFF[];
+ static const char AUDIO_ZOOM_ON[];
+ static const char BEAUTY_SHOT_OFF[];
+ static const char BEAUTY_SHOT_ON[];
+ static const char BURST_SHOT_OFF[];
+ static const char BURST_SHOT_ON[];
+ static const char KEY_AUDIO_ZOOM[];
+ static const char KEY_AUDIO_ZOOM_SUPPORTED[];
+ static const char KEY_BEAUTY_SHOT[];
+ static const char KEY_BEAUTY_SHOT_SUPPORTED[];
+ static const char KEY_BURST_SHOT[];
+ static const char KEY_BURST_SHOT_SUPPORTED[];
+ static const char KEY_FOCUS_MODE_OBJECT_TRACKING[];
+ static const char KEY_FOCUS_MODE_OBJECT_TRACKING_SUPPORTED[];
+ static const char KEY_VIDEO_WDR[];
+ static const char KEY_VIDEO_WDR_SUPPORTED[];
+ static const char VIDEO_WDR_OFF[];
+ static const char VIDEO_WDR_ON[];
+ static const char OBJECT_TRACKING_ON[];
+ static const char OBJECT_TRACKING_OFF[];
+#endif
+
static const char KEY_AE_BRACKET_HDR[];
// Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED.