commit daa94b67b40d51310ce41e95b90116de5109efa8
author Ed Carrigan <cretin45@gmail.com> Tue Sep 04 22:13:43 2012 -0700
committer andrew.boren <andrew.boren@gmail.com> Fri Dec 28 20:10:55 2012 -0700
tree 1453d0755d75598a2e6f5cda79b773ba44fa38f9
parent 4eec13829c0f00a2a4ec8346c1d13ea39115d67c

camera: add missing symbols for HTC 8660 camera HAL

Forward port of patch from HTC 8660 missing symbols patch from ICS.

Change-Id: I9ed27e3bc1b0d63c437b3cf9518b36e0da546e81

camera/CameraParameters.cpp

diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 51366ad..3f9e3fb 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -226,6 +226,7 @@
 const char CameraParameters::SCENE_MODE_HDR[] = "hdr";
 #ifdef QCOM_HARDWARE
 const char CameraParameters::SCENE_MODE_AR[] = "AR";
+const char CameraParameters::SCENE_MODE_OFF[] = "off";
 
 // Values for auto scene detection settings.
 const char CameraParameters::SCENE_DETECT_OFF[] = "off";
@@ -262,6 +263,7 @@
 const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";
 const char CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE[] = "continuous-picture";
 #if defined(QCOM_HARDWARE)
+const char CameraParameters::FOCUS_MODE_CONTINUOUS_CAMERA[] = "continuous-camera";
 const char CameraParameters::FOCUS_MODE_NORMAL[] = "normal";
 
 
@@ -568,6 +570,11 @@
     }
 }
 
+void CameraParameters::setPostviewSize(int width, int height)
+{
+    // dummy
+}
+
 void CameraParameters::setPreviewSize(int width, int height)
 {
     char str[32];

include/camera/CameraParameters.h

diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index bd9efc2..07fce84 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -728,6 +728,7 @@
     static const char SCENE_MODE_BACKLIGHT[];
     static const char SCENE_MODE_FLOWERS[];
     static const char SCENE_MODE_AR[];
+    static const char SCENE_MODE_OFF[];
 #endif
     // Applications are looking for a barcode. Camera driver will be optimized
     // for barcode reading.
@@ -911,6 +912,7 @@
     int getOrientation() const;
     void setOrientation(int orientation);
     void setPreviewFpsRange(int minFPS,int maxFPS);
+    void setPostviewSize(int x, int y);
     void getSupportedHfrSizes(Vector<Size> &sizes) const;
 #endif