add (5000,15000) to fixed can't fps range error

maybe it is not requested.
Signed-off-by: jiyu.yang <jiyu.yang@amlogic.com>

Change-Id: Iedb7548d6eac50305b05b3cd7c82a681506789f7

2 files changed, 12 insertions, 8 deletions

diff --git a/CameraHal.cpp b/CameraHal.cpp
index cb20da1..f739a77 100755
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -582,14 +582,18 @@ int CameraHal::setParameters(const CameraParameters& params)
         if (valstr == NULL)
             valstr = "";
         //Perform parameter validation
+#if 1
         if(!isParameterValid(valstr
-                        , mCameraProperties->get(CameraProperties::FRAMERATE_RANGE_SUPPORTED))
-                        || !isParameterValid(framerate,
+                        , mCameraProperties->get(CameraProperties::FRAMERATE_RANGE_SUPPORTED))){
+            DBG_LOGA("Invalid frame rate range or frame rate, need to change?");
+        }
+        if (!isParameterValid(framerate,
                                       mCameraProperties->get(CameraProperties::SUPPORTED_PREVIEW_FRAME_RATES)))
         {
             CAMHAL_LOGEA("Invalid frame rate range or frame rate");
             return -EINVAL;
         }
+#endif
 
         // Variable framerate ranges have higher priority over
         // deprecated constant FPS. "KEY_PREVIEW_FPS_RANGE" should
diff --git a/V4LCameraAdapter/V4LCameraAdapter.cpp b/V4LCameraAdapter/V4LCameraAdapter.cpp
index 3ecddde..55c26be 100755
--- a/V4LCameraAdapter/V4LCameraAdapter.cpp
+++ b/V4LCameraAdapter/V4LCameraAdapter.cpp
@@ -2845,7 +2845,7 @@ static bool getCameraBanding(int camera_fd, char* banding_modes, char*def_bandin
         strcpy( def_banding_mode, "50hz");
     }
     if (NULL == strstr(banding_modes, "auto")) {
-        strcat( banding_modes, "auto");
+        strcat( banding_modes, ",auto");
     }
 
     return true;
@@ -3160,7 +3160,7 @@ extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params) {
         params->set(CameraProperties::FRAMERATE_RANGE_VIDEO, fpsrange);
 
         memset(fpsrange, 0, sizeof(fpsrange));;
-        sprintf(fpsrange,"(%s%d)","5000,",fps*1000/fps_num);
+        sprintf(fpsrange,"(%s%d)","5000,15000),(5000,",fps*1000/fps_num);
         params->set(CameraProperties::FRAMERATE_RANGE_SUPPORTED, fpsrange);
         memset(fpsrange, 0, sizeof(fpsrange));
         sprintf(fpsrange,"%s%d","5000,",fps*1000/fps_num);
@@ -3172,8 +3172,8 @@ extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params) {
         params->set(CameraProperties::SUPPORTED_PREVIEW_FRAME_RATES, "5,15");
         params->set(CameraProperties::PREVIEW_FRAME_RATE, "15");
 
-        params->set(CameraProperties::FRAMERATE_RANGE_SUPPORTED, "(5000,26623)");
-        params->set(CameraProperties::FRAMERATE_RANGE, "5000,26623");
+        params->set(CameraProperties::FRAMERATE_RANGE_SUPPORTED, "(5000,15000),(5000,30000)");
+        params->set(CameraProperties::FRAMERATE_RANGE, "5000,30000");
         params->set(CameraProperties::FRAMERATE_RANGE_IMAGE, "5000,15000");
         params->set(CameraProperties::FRAMERATE_RANGE_VIDEO, "5000,15000");
     }
@@ -3181,8 +3181,8 @@ extern "C" void loadCaps(int camera_id, CameraProperties::Properties* params) {
     params->set(CameraProperties::SUPPORTED_PREVIEW_FRAME_RATES, "5,15");
     params->set(CameraProperties::PREVIEW_FRAME_RATE, "15");
 
-    params->set(CameraProperties::FRAMERATE_RANGE_SUPPORTED, "(5000,26623)");
-    params->set(CameraProperties::FRAMERATE_RANGE, "5000,26623");
+    params->set(CameraProperties::FRAMERATE_RANGE_SUPPORTED, "(5000,15000),(5000,30000)");
+    params->set(CameraProperties::FRAMERATE_RANGE, "5000,30000");
     params->set(CameraProperties::FRAMERATE_RANGE_IMAGE, "5000,15000");
     params->set(CameraProperties::FRAMERATE_RANGE_VIDEO, "5000,15000");
 #endif