Set default fps range for video mode to 24<->30

Hack to allow image mode fps=15 and
vide mode fps = 24

Change-Id: Ie2a4b3d5c7e32515a1af948fa65c934baaf3e1a9
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>

5 files changed, 16 insertions, 7 deletions

diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 4db34d8..5b1def1 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -253,6 +253,7 @@ int CameraHal::setParameters(const CameraParameters& params)
     // Needed for KEY_RECORDING_HINT
     bool restartPreviewRequired = false;
     CameraParameters oldParams(mParameters.flatten());
+    bool videoMode = false;
 
     {
         Mutex::Autolock lock(mLock);
@@ -385,6 +386,7 @@ int CameraHal::setParameters(const CameraParameters& params)
                 CAMHAL_LOGDB("Recording Hint is set to %s", valstr);
                 mParameters.set(CameraParameters::KEY_RECORDING_HINT, valstr);
                 restartPreviewRequired = setVideoModeParameters();
+                videoMode = true;
                 }
             else if(strcmp(valstr, CameraParameters::FALSE) == 0)
                 {
@@ -451,6 +453,14 @@ int CameraHal::setParameters(const CameraParameters& params)
             CAMHAL_LOGDB("FPS Range = %s", valstr);
             params.getPreviewFpsRange(&minFPS, &maxFPS);
 
+            if (videoMode)
+              {
+                mCameraProperties->set(CameraProperties::FRAMERATE_RANGE, CameraProperties::DEFAULT_VIDEO_FPS_RANGE);
+                valstr = mCameraProperties->get(CameraProperties::FRAMERATE_RANGE);
+                mParameters.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, valstr);
+                mParameters.getPreviewFpsRange(&minFPS, &maxFPS);
+              }
+
             if ( ( 0 > minFPS ) || ( 0 > maxFPS ) )
                 {
                 CAMHAL_LOGEA("ERROR: FPS Range is negative!");
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index dfb941b..092a20c 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -112,6 +112,8 @@ const char CameraProperties::DEFAULT_VALUE[] = "";
 
 const char CameraProperties::PARAMS_DELIMITER []= ",";
 
+const char CameraProperties::DEFAULT_VIDEO_FPS_RANGE[]="24000,30000";
+
 // Returns the properties class for a specific Camera
 // Each value is indexed by the CameraProperties::CameraPropertyIndex enum
 int CameraProperties::getProperties(int cameraIndex, CameraProperties::Properties** properties)
diff --git a/camera/OMXCameraAdapter/OMXCapabilities.cpp b/camera/OMXCameraAdapter/OMXCapabilities.cpp
index ec7be70..0e329b9 100644
--- a/camera/OMXCameraAdapter/OMXCapabilities.cpp
+++ b/camera/OMXCameraAdapter/OMXCapabilities.cpp
@@ -106,11 +106,7 @@ const CapPixelformat OMXCameraAdapter::mPixelformats [] = {
 
 const CapFramerate OMXCameraAdapter::mFramerates [] = {
     { 30, "30" },
-    { 25, "25" },
-    { 24, "24" },
-    { 20, "20" },
     { 15, "15" },
-    { 10, "10" },
 };
 
 const CapZoom OMXCameraAdapter::mZoomStages [] = {
@@ -648,8 +644,8 @@ status_t OMXCameraAdapter::insertVFramerates(CameraProperties::Properties* param
     } else {
         params->set(CameraProperties::FRAMERATE_RANGE_SUPPORTED, supported);
         CAMHAL_LOGDB("framerate ranges %s", supported);
-        params->set(CameraProperties::FRAMERATE_RANGE, defaultRange);
-        CAMHAL_LOGDB("Default framerate range: [%s]", defaultRange);
+        params->set(CameraProperties::FRAMERATE_RANGE, DEFAULT_FRAMERATE_RANGE);
+        CAMHAL_LOGDB("Default framerate range: [%s]", DEFAULT_FRAMERATE_RANGE);
     }
 
     LOG_FUNCTION_NAME;
diff --git a/camera/OMXCameraAdapter/OMXDefaults.cpp b/camera/OMXCameraAdapter/OMXDefaults.cpp
index 1f6af83..5801d3c 100644
--- a/camera/OMXCameraAdapter/OMXDefaults.cpp
+++ b/camera/OMXCameraAdapter/OMXDefaults.cpp
@@ -39,7 +39,7 @@ const char OMXCameraAdapter::DEFAULT_EV_STEP[] = "0.1";
 const char OMXCameraAdapter::DEFAULT_EXPOSURE_MODE[] = "auto";
 const char OMXCameraAdapter::DEFAULT_FLASH_MODE[] = "off";
 const char OMXCameraAdapter::DEFAULT_FOCUS_MODE[] = "infinity";
-const char OMXCameraAdapter::DEFAULT_FRAMERATE_RANGE[] = "20000,30000";
+const char OMXCameraAdapter::DEFAULT_FRAMERATE_RANGE[] = "15000,30000";
 const char OMXCameraAdapter::DEFAULT_IPP[] = "ldc-nsf";
 const char OMXCameraAdapter::DEFAULT_GBCE[] = "enable";
 const char OMXCameraAdapter::DEFAULT_ISO_MODE[] = "auto";
diff --git a/camera/inc/CameraProperties.h b/camera/inc/CameraProperties.h
index 186aa4b..27824f3 100644
--- a/camera/inc/CameraProperties.h
+++ b/camera/inc/CameraProperties.h
@@ -130,6 +130,7 @@ public:
     static const char MAX_NUM_FOCUS_AREAS[];

 

     static const char VIDEO_SNAPSHOT_SUPPORTED[];

+    static const char DEFAULT_VIDEO_FPS_RANGE[];

 

     CameraProperties();

     ~CameraProperties();