camera: add some missing parameters and fix orientation and preview issues
Change-Id: I282172c5cc4b0e93284b37dbead33d48201e36d9
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 41c4354..4209a29 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -53,10 +53,12 @@
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_CAF[] = "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_CAF[] = "continuous-af-values";
const char CameraParameters::KEY_SUPPORTED_CAPTURE_MODES[] = "capture-mode-values";
const char CameraParameters::KEY_TAKING_PICTURE_ZOOM[] = "taking-picture-zoom";
const char CameraParameters::KEY_PANORAMA_MODE[] = "panorama-mode";
@@ -430,6 +432,28 @@
const char CameraParameters::LOW_POWER[] = "Low_Power";
const char CameraParameters::NORMAL_POWER[] = "Normal_Power";
+#if defined(QCOM_HARDWARE) && defined(SAMSUNG_CAMERA_LEGACY)
+const char CameraParameters::FOCUS_MODE_FACEDETECT[] = "facedetect";
+const char CameraParameters::FOCUS_MODE_TOUCHAF[] = "touchaf";
+const char CameraParameters::ISO_50[] = "ISO50";
+const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "antishake";
+const char CameraParameters::KEY_AUTO_CONTRAST[] = "auto-contrast";
+const char CameraParameters::KEY_BEAUTY_MODE[] = "beauty";
+const char CameraParameters::KEY_BLUR_MODE[] = "blur";
+const char CameraParameters::KEY_VINTAGE_MODE[] = "vintagemode";
+const char CameraParameters::KEY_WDR_MODE[] = "wdr";
+const char CameraParameters::VINTAGE_MODE_BNW[] = "bnw";
+const char CameraParameters::VINTAGE_MODE_COOL[] = "cool";
+const char CameraParameters::VINTAGE_MODE_NORMAL[] = "normal";
+const char CameraParameters::VINTAGE_MODE_OFF[] = "off";
+const char CameraParameters::VINTAGE_MODE_WARM[] = "warm";
+const char CameraParameters::SCENE_MODE_DAWN[] = "dusk-dawn";
+const char CameraParameters::SCENE_MODE_DUSKDAWN[] = "dusk-dawn";
+const char CameraParameters::SCENE_MODE_FALL[] = "fall-color";
+const char CameraParameters::SCENE_MODE_FALL_COLOR[] = "fall-color";
+const char CameraParameters::SCENE_MODE_TEXT[] = "text";
+#endif
+
static const char* portrait = "portrait";
static const char* landscape = "landscape";
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index a43e7a8..1208275 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -185,6 +185,7 @@
static const char KEY_PICTURE_COUNT[];
static const char KEY_MAX_BURST_PICTURE_COUNT[];
static const char KEY_SUPPORTED_CONTINUOUS_AF[];
+ static const char KEY_SUPPORTED_CAF[];
static const char KEY_TAKING_PICTURE_ZOOM[];
static const char KEY_PANORAMA_MODE[];
static const char PANORAMA_MODE_NOT_INPROGRESS[];
@@ -881,7 +882,7 @@
static const char CONTINUOUS_AF_OFF[] ;
static const char CONTINUOUS_AF_ON[] ;
static const char KEY_CONTINUOUS_AF[] ;
-
+ static const char KEY_CAF[] ;
// Normal focus mode. Applications should call
// CameraHardwareInterface.autoFocus to start the focus in this mode.
static const char FOCUS_MODE_NORMAL[];
@@ -977,6 +978,28 @@
static const char HDR_ENABLE[];
static const char HDR_DISABLE[];
+#if defined(QCOM_HARDWARE) && defined(SAMSUNG_CAMERA_LEGACY)
+ static const char FOCUS_MODE_FACEDETECT[];
+ static const char FOCUS_MODE_TOUCHAF[];
+ static const char ISO_50[];
+ static const char KEY_ANTI_SHAKE_MODE[];
+ static const char KEY_AUTO_CONTRAST[];
+ static const char KEY_BEAUTY_MODE[];
+ static const char KEY_BLUR_MODE[];
+ static const char KEY_VINTAGE_MODE[];
+ static const char KEY_WDR_MODE[];
+ static const char VINTAGE_MODE_BNW[];
+ static const char VINTAGE_MODE_COOL[];
+ static const char VINTAGE_MODE_NORMAL[];
+ static const char VINTAGE_MODE_OFF[];
+ static const char VINTAGE_MODE_WARM[];
+ static const char SCENE_MODE_DAWN[];
+ static const char SCENE_MODE_DUSKDAWN[];
+ static const char SCENE_MODE_FALL[];
+ static const char SCENE_MODE_FALL_COLOR[];
+ static const char SCENE_MODE_TEXT[];
+#endif
+
// Values for Redeye Reduction settings.
// static const char REDEYE_REDUCTION_ENABLE[];
// static const char REDEYE_REDUCTION_DISABLE[];
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp
index 3972613..7363a10 100644
--- a/services/camera/libcameraservice/CameraClient.cpp
+++ b/services/camera/libcameraservice/CameraClient.cpp
@@ -251,8 +251,10 @@
// Release the held ANativeWindow resources.
if (mPreviewWindow != 0) {
#ifdef QCOM_HARDWARE
+#ifndef NO_UPDATE_PREVIEW
mHardware->setPreviewWindow(0);
#endif
+#endif
disconnectWindow(mPreviewWindow);
mPreviewWindow = 0;
#ifndef QCOM_HARDWARE
@@ -297,9 +299,14 @@
result = mHardware->setPreviewWindow(window);
}
#ifdef QCOM_HARDWARE
+#ifndef NO_UPDATE_PREVIEW
} else {
+ if (window != 0) {
+ native_window_set_buffers_transform(window.get(), mOrientation);
+ }
result = mHardware->setPreviewWindow(window);
#endif
+#endif
}
if (result == NO_ERROR) {