Camera_test: Re-arrange creation of buffer sources

- The buffer source adapters should be re-created
  if changed some parameters.

Change-Id: Ifd9e2c406adf8fbab11dcb530b87a8d01e490341
Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>

1 files changed, 13 insertions, 12 deletions

diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp
index 64ced44..4a017bc 100644
--- a/test/CameraHal/camera_test_script.cpp
+++ b/test/CameraHal/camera_test_script.cpp
@@ -171,6 +171,10 @@ extern int manualConvMax ;
 extern bool faceDetectToggle;
 extern unsigned int burstCount;
 
+/** Buffer source reset */
+extern bool bufferSourceInputReset;
+extern bool bufferSourceOutputReset;
+
 void trim_script_cmd(char *cmd) {
     char *nl, *cr;
 
@@ -351,10 +355,6 @@ int execute_functional_script(char *script) {
                 } else {
                     stopPreview();
                 }
-                if (bufferSourceOutputThread.get()) {
-                    bufferSourceOutputThread->requestExit();
-                    bufferSourceOutputThread.clear();
-                }
 
                 break;
 
@@ -436,6 +436,9 @@ int execute_functional_script(char *script) {
                         camera->setParameters(params.flatten());
                     }
                 }
+
+                requestBufferSourceReset();
+
                 break;
 
             case '6':
@@ -720,6 +723,8 @@ int execute_functional_script(char *script) {
                 if ( hardwareActive )
                     camera->setParameters(params.flatten());
 
+                requestBufferSourceReset();
+
                 break;
 
             case 'K':
@@ -810,6 +815,8 @@ int execute_functional_script(char *script) {
                     camera->setParameters(params.flatten());
                 }
 
+                requestBufferSourceReset();
+
                 break;
 
             case 'U':
@@ -1252,14 +1259,8 @@ int execute_functional_script(char *script) {
                 ShotParameters reprocParams;
 
                 gettimeofday(&picture_start, 0);
-                if (!bufferSourceInput.get()) {
-#ifdef ANDROID_API_JB_OR_LATER
-                    bufferSourceInput = new BQ_BufferSourceInput(1234, camera);
-#else
-                    bufferSourceInput = new ST_BufferSourceInput(1234, camera);
-#endif
-                    bufferSourceInput->init();
-                }
+
+                createBufferInputSource();
 
                 if (bufferSourceOutputThread.get() &&
                     bufferSourceOutputThread->hasBuffer())