CameraHal: Set KEY_VIDEO_SNAPSHOT_SUPPORTED default

Change-Id: I106a62bc752398f52224d1b1b7ef78a703ab1f17
Signed-off-by: Iliyan Malchev <malchev@google.com>

6 files changed, 8 insertions, 0 deletions

diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index c770b7a..dde2145 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -3007,6 +3007,7 @@ void CameraHal::insertSupportedParams()
     p.set(TICameraParameters::KEY_SENSOR_ORIENTATION_VALUES, mCameraProperties->get(CameraProperties::SENSOR_ORIENTATION_VALUES));
     p.set(CameraParameters::KEY_AUTO_EXPOSURE_LOCK_SUPPORTED, mCameraProperties->get(CameraProperties::AUTO_EXPOSURE_LOCK_SUPPORTED));
     p.set(CameraParameters::KEY_AUTO_WHITEBALANCE_LOCK_SUPPORTED, mCameraProperties->get(CameraProperties::AUTO_WHITEBALANCE_LOCK_SUPPORTED));
+    p.set(CameraParameters::KEY_VIDEO_SNAPSHOT_SUPPORTED, mCameraProperties->get(CameraProperties::VIDEO_SNAPSHOT_SUPPORTED));
 
     LOG_FUNCTION_NAME_EXIT;
 
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 27f9c27..dfb941b 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -106,6 +106,7 @@ const char CameraProperties::AUTO_WHITEBALANCE_LOCK[] = "prop-auto-whitebalance-
 const char CameraProperties::AUTO_WHITEBALANCE_LOCK_SUPPORTED[] = "prop-auto-whitebalance-lock-supported";
 const char CameraProperties::MAX_NUM_METERING_AREAS[] = "prop-max-num-metering-areas";
 const char CameraProperties::METERING_AREAS[] = "prop-metering-areas";
+const char CameraProperties::VIDEO_SNAPSHOT_SUPPORTED[] = "prop-video-snapshot-supported";
 
 const char CameraProperties::DEFAULT_VALUE[] = "";
 
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp
index 5525a3f..ec7be70 100644
--- a/camera/OMXCameraAdapter/OMXCapabilities.cpp
+++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp
@@ -1003,6 +1003,7 @@ status_t OMXCameraAdapter::insertDefaults(CameraProperties::Properties* params,
     params->set(CameraProperties::FOCAL_LENGTH, DEFAULT_FOCAL_LENGTH);
     params->set(CameraProperties::HOR_ANGLE, DEFAULT_HOR_ANGLE);
     params->set(CameraProperties::VER_ANGLE, DEFAULT_VER_ANGLE);
+    params->set(CameraProperties::VIDEO_SNAPSHOT_SUPPORTED, DEFAULT_VIDEO_SNAPSHOT_SUPPORTED);
     LOG_FUNCTION_NAME;
 
     return ret;
diff --git a/camera/OMXCameraAdapter/OMXDefaults.cpp b/camera/OMXCameraAdapter/OMXDefaults.cpp
index 6661f50..1f6af83 100644
--- a/camera/OMXCameraAdapter/OMXDefaults.cpp
+++ b/camera/OMXCameraAdapter/OMXDefaults.cpp
@@ -70,6 +70,7 @@ const char OMXCameraAdapter::DEFAULT_AWB_LOCK[] = "false";
 const char OMXCameraAdapter::DEFAULT_MAX_NUM_METERING_AREAS[] = "0";
 const char OMXCameraAdapter::DEFAULT_LOCK_SUPPORTED[] = "true";
 const char OMXCameraAdapter::DEFAULT_LOCK_UNSUPPORTED[] = "false";
+const char OMXCameraAdapter::DEFAULT_VIDEO_SNAPSHOT_SUPPORTED[] = "true";
 
 };
 
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h
index 0af80f2..186aa4b 100644
--- a/camera/inc/CameraProperties.h
+++ b/camera/inc/CameraProperties.h
@@ -129,6 +129,8 @@ public:
     static const char METERING_AREAS[];

     static const char MAX_NUM_FOCUS_AREAS[];

 

+    static const char VIDEO_SNAPSHOT_SUPPORTED[];

+

     CameraProperties();

     ~CameraProperties();

 

diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
index a87f9a5..4f53b7d 100644
--- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
+++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h
@@ -709,6 +709,8 @@ private:
     static const char DEFAULT_FOCAL_LENGTH[];
     static const char DEFAULT_HOR_ANGLE[];
     static const char DEFAULT_VER_ANGLE[];
+    static const char DEFAULT_VIDEO_SNAPSHOT_SUPPORTED[];
+    static const size_t MAX_FOCUS_AREAS;
 
     OMX_VERSIONTYPE mCompRevision;