camera: Add parameters for HTC msm8960
This is mainly taken from the ICS commit
dc4a6eb75a44136c9e753d1569058a7cfc1e1704
all ifdef'ed with QCOM_HARDWARE
and necessary for the camera on the HTC One S (ville)
Change-Id: Ieaf3e9110c78d677a16e096ae6848d3a08aa5ddc
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index eaf35b4..b9ba44f 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -40,6 +40,24 @@
const char CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[] = "preview-frame-rate-modes";
const char CameraParameters::KEY_PREVIEW_FRAME_RATE_AUTO_MODE[] = "frame-rate-auto";
const char CameraParameters::KEY_PREVIEW_FRAME_RATE_FIXED_MODE[] = "frame-rate-fixed";
+//Values for Continuous AF
+const char CameraParameters::CAF_OFF[] = "caf-off";
+const char CameraParameters::CAF_ON[] = "caf-on";
+//Same, for CodeAurora-based blobs
+const char CameraParameters::CAPTURE_MODE_NORMAL[] = "normal";
+const char CameraParameters::CAPTURE_MODE_BURST[] = "burst";
+const char CameraParameters::CAPTURE_MODE_CONTI_BURST[] = "contiburst";
+const char CameraParameters::CAPTURE_MODE_HDR[] = "hdr";
+const char CameraParameters::CAPTURE_MODE_HJR[] = "hjr";
+const char CameraParameters::CAPTURE_MODE_PANORAMA[] = "panorama";
+const char CameraParameters::CONTINUOUS_AF_OFF[] = "caf-off";
+const char CameraParameters::CONTINUOUS_AF_ON[] = "caf-on";
+const char CameraParameters::KEY_CONTINUOUS_AF[] = "continuous-af";
+const char CameraParameters::KEY_CAPTURE_MODE[] = "capture-mode";
+const char CameraParameters::KEY_PICTURE_COUNT[] = "picture-count";
+const char CameraParameters::KEY_MAX_BURST_PICTURE_COUNT[] = "max-burst-picture-count";
+const char CameraParameters::KEY_SUPPORTED_CONTINUOUS_AF[] = "continuous-af-mode";
+const char CameraParameters::KEY_SUPPORTED_CAPTURE_MODES[] = "capture-mode-values";
#endif
const char CameraParameters::KEY_PICTURE_SIZE[] = "picture-size";
const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values";
@@ -307,11 +325,26 @@
const char CameraParameters::SKIN_TONE_ENHANCEMENT_DISABLE[] = "disable";
const char CameraParameters::KEY_SHARPNESS[] = "sharpness";
+#ifdef QCOM_HARDWARE
+const char CameraParameters::KEY_MAX_SHARPNESS[] = "sharpness-max";
+const char CameraParameters::KEY_MIN_SHARPNESS[] = "sharpness-min";
+#else
const char CameraParameters::KEY_MAX_SHARPNESS[] = "max-sharpness";
+#endif
const char CameraParameters::KEY_CONTRAST[] = "contrast";
+#ifdef QCOM_HARDWARE
+const char CameraParameters::KEY_MAX_CONTRAST[] = "contrast-max";
+const char CameraParameters::KEY_MIN_CONTRAST[] = "contrast-min";
+#else
const char CameraParameters::KEY_MAX_CONTRAST[] = "max-contrast";
+#endif
const char CameraParameters::KEY_SATURATION[] = "saturation";
+#ifdef QCOM_HARDWARE
+const char CameraParameters::KEY_MAX_SATURATION[] = "saturation-max";
+const char CameraParameters::KEY_MIN_SATURATION[] = "saturation-min";
+#else
const char CameraParameters::KEY_MAX_SATURATION[] = "max-saturation";
+#endif
//Values for DENOISE
const char CameraParameters::DENOISE_OFF[] = "denoise-off";
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 07fce84..50f2587 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -179,6 +179,17 @@
static const char KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[];
static const char KEY_PREVIEW_FRAME_RATE_AUTO_MODE[];
static const char KEY_PREVIEW_FRAME_RATE_FIXED_MODE[];
+ static const char KEY_CAPTURE_MODE[];
+ static const char KEY_SUPPORTED_CAPTURE_MODES[];
+ static const char KEY_PICTURE_COUNT[];
+ static const char KEY_MAX_BURST_PICTURE_COUNT[];
+ static const char KEY_SUPPORTED_CONTINUOUS_AF[];
+ static const char CAPTURE_MODE_NORMAL[];
+ static const char CAPTURE_MODE_BURST[];
+ static const char CAPTURE_MODE_CONTI_BURST[];
+ static const char CAPTURE_MODE_HDR[];
+ static const char CAPTURE_MODE_HJR[];
+ static const char CAPTURE_MODE_PANORAMA[];
#endif
// The dimensions for captured pictures in pixels (width x height).
// Example value: "1024x768". Read/write.
@@ -819,6 +830,16 @@
static const char FOCUS_MODE_CONTINUOUS_PICTURE[];
#ifdef QCOM_HARDWARE
+ static const char FOCUS_MODE_CONTINUOUS_CAMERA[];
+
+ // Values for Continuous AF
+ static const char CAF_OFF[] ;
+ static const char CAF_ON[] ;
+ // Proprietaries from CodeAurora use these...
+ static const char CONTINUOUS_AF_OFF[] ;
+ static const char CONTINUOUS_AF_ON[] ;
+ static const char KEY_CONTINUOUS_AF[] ;
+
// Normal focus mode. Applications should call
// CameraHardwareInterface.autoFocus to start the focus in this mode.
static const char FOCUS_MODE_NORMAL[];
@@ -842,10 +863,19 @@
static const char KEY_SHARPNESS[];
static const char KEY_MAX_SHARPNESS[];
+#ifdef QCOM_HARDWARE
+ static const char KEY_MIN_SHARPNESS[];
+#endif
static const char KEY_CONTRAST[];
static const char KEY_MAX_CONTRAST[];
+#ifdef QCOM_HARDWARE
+ static const char KEY_MIN_CONTRAST[];
+#endif
static const char KEY_SATURATION[];
static const char KEY_MAX_SATURATION[];
+#ifdef QCOM_HARDWARE
+ static const char KEY_MIN_SATURATION[];
+#endif
static const char KEY_HISTOGRAM[] ;
static const char KEY_SUPPORTED_HISTOGRAM_MODES[] ;