camera_test: capture mode fix

When capture mode is changed supported parameters are dumped.
Framerate and capture size are set form the supported onces.

Change-Id: Idc6b1280d1fcefda17ea0bed5f4ed6cafdbd9eea
Signed-off-by: Dimitar Borisov <x0152684@ti.com>

2 files changed, 28 insertions, 1 deletions

diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index 8fdc5fc..4698116 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -3079,9 +3079,21 @@ int functional_menu() {
             params.set(KEY_MODE, (modevalues[capture_mode]));
 
             if ( hardwareActive ) {
+                if (previewRunning) {
+                    stopPreview();
+                }
                 camera->setParameters(params.flatten());
+                // Get parameters from capabilities for the new capture mode
                 params = camera->getParameters();
                 getSizeParametersFromCapabilities();
+                getParametersFromCapabilities();
+                // Set framerate 30fps and 12MP capture resolution if available for the new capture mode.
+                // If not available set framerate and capture mode under index 0 from fps_const_str and capture_Array.
+                frameRateIDX = getDefaultParameter("30000,30000", constCnt, fps_const_str);
+                captureSizeIDX = getDefaultParameterResol("12MP", numcaptureSize, capture_Array);
+                params.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, fps_const_str[frameRateIDX]);
+                params.setPictureSize(capture_Array[captureSizeIDX]->width, capture_Array[captureSizeIDX]->height);
+                camera->setParameters(params.flatten());
             }
 
             break;
diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp
index c4e2f2e..7d77386 100644
--- a/test/CameraHal/camera_test_script.cpp
+++ b/test/CameraHal/camera_test_script.cpp
@@ -781,8 +781,23 @@ int execute_functional_script(char *script) {
                     printf("\nNot supported parameter %s from sensor %d\n\n", cmd + 1, camera_index);
                 }
 
-                if ( hardwareActive )
+                if ( hardwareActive ) {
+                    if (previewRunning) {
+                        stopPreview();
+                    }
                     camera->setParameters(params.flatten());
+                    // Get parameters from capabilities for the new capture mode
+                    params = camera->getParameters();
+                    getSizeParametersFromCapabilities();
+                    getParametersFromCapabilities();
+                    // Set framerate 30fps and 12MP capture resolution if available for the new capture mode.
+                    // If not available set framerate and capture mode under index 0 from fps_const_str and capture_Array.
+                    frameRateIDX = getDefaultParameter("30000,30000", constCnt, fps_const_str);
+                    captureSizeIDX = getDefaultParameterResol("12MP", numcaptureSize, capture_Array);
+                    params.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, fps_const_str[frameRateIDX]);
+                    params.setPictureSize(capture_Array[captureSizeIDX]->width, capture_Array[captureSizeIDX]->height);
+                    camera->setParameters(params.flatten());
+                }
 
                 break;