summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/camera/CameraParameters.h6
-rw-r--r--libs/camera/CameraParameters.cpp5
2 files changed, 11 insertions, 0 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index eaf02a6..5aa0648 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -653,6 +653,12 @@ public:
static const char KEY_SUPPORTED_REDEYE_REDUCTION[];
#endif
+#ifdef SAMSUNG_CAMERA_HARDWARE
+ static const char KEY_METERING[];
+ static const char KEY_WDR[];
+ static const char KEY_ANTI_SHAKE_MODE[];
+#endif
+
// Values for white balance settings.
static const char WHITE_BALANCE_AUTO[];
static const char WHITE_BALANCE_INCANDESCENT[];
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index 2a92e9b..4f1f7d316 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -138,6 +138,11 @@ const char CameraParameters::KEY_SUPPORTED_REDEYE_REDUCTION[] = "redeye-reductio
const char CameraParameters::KEY_HIGH_DYNAMIC_RANGE_IMAGING[] = "hdr";
const char CameraParameters::KEY_SUPPORTED_HDR_IMAGING_MODES[] = "hdr-values";
#endif
+#ifdef SAMSUNG_CAMERA_HARDWARE
+const char CameraParameters::KEY_METERING[] = "metering";
+const char CameraParameters::KEY_WDR[] = "wdr";
+const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "anti-shake";
+#endif
const char CameraParameters::KEY_VIDEO_SIZE[] = "video-size";
const char CameraParameters::KEY_SUPPORTED_VIDEO_SIZES[] = "video-size-values";
const char CameraParameters::KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO[] = "preferred-preview-size-for-video";