fixing start faulure on some devices; syncronization improvements

Andrey Pavlenko · Andrey Pavlenko · commit 016011fdf8d9 · 2015-08-27T14:05:31.000+03:00
diff --git a/samples/android/tutorial-4-opencl/src/org/opencv/samples/tutorial4/Camera2Renderer.java b/samples/android/tutorial-4-opencl/src/org/opencv/samples/tutorial4/Camera2Renderer.java
@@ -73,7 +73,6 @@ boolean cacPreviewSize(final int width, final int height) {
                      Math.abs(aspect - (float)w/h) < 0.2 ) {
                     bestWidth = w;
                     bestHeight = h;
-                    //mPreviewSize = psize;
                 }
             }
             Log.i(LOGTAG, "best size: "+bestWidth+"x"+bestHeight);
@@ -156,9 +155,9 @@ public void onOpened(CameraDevice cameraDevice) {
 
         @Override
         public void onDisconnected(CameraDevice cameraDevice) {
-            //mCameraOpenCloseLock.release();
             cameraDevice.close();
             mCameraDevice = null;
+            mCameraOpenCloseLock.release();
         }
 
         @Override
@@ -185,14 +184,14 @@ private void createCameraPreviewSession() {
                 return;
             }
             if(null == mSTex) {
+                mCameraOpenCloseLock.release();
                 Log.e(LOGTAG, "createCameraPreviewSession: preview SurfaceTexture is null");
                 return;
             }
             Log.d(LOGTAG, "starting preview "+mPreviewSize.getWidth()+"x"+mPreviewSize.getHeight());
             mSTex.setDefaultBufferSize(mPreviewSize.getWidth(), mPreviewSize.getHeight());
 
             Surface surface = new Surface(mSTex);
-            Log.d(LOGTAG, "createCameraPreviewSession: surface = " + surface);
 
             mPreviewRequestBuilder = mCameraDevice
                     .createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
@@ -215,6 +214,7 @@ public void onConfigured(
                                 mCaptureSession.setRepeatingRequest(
                                         mPreviewRequestBuilder.build(), null,
                                         mBackgroundHandler);
+                                Log.i(LOGTAG, "CameraPreviewSession has been started");
                             } catch (CameraAccessException e) {
                                 Log.e(LOGTAG, "createCaptureSession failed");
                             }
@@ -227,15 +227,15 @@ public void onConfigureFailed(
                             Log.e(LOGTAG, "createCameraPreviewSession failed");
                             mCameraOpenCloseLock.release();
                         }
-                    }, null);
+                    }, mBackgroundHandler);
         } catch (CameraAccessException e) {
             Log.e(LOGTAG, "createCameraPreviewSession");
         } catch (InterruptedException e) {
             throw new RuntimeException(
                     "Interrupted while createCameraPreviewSession", e);
         }
         finally {
-            mCameraOpenCloseLock.release();
+            //mCameraOpenCloseLock.release();
         }
     }
 
@@ -262,12 +262,15 @@ private void stopBackgroundThread() {
 
     @Override
     protected void setCameraPreviewSize(int width, int height) {
-        //mPreviewSize = new Size(width, height);
-        if( !cacPreviewSize(width, height) )
-            return;
+        Log.i(LOGTAG, "setCameraPreviewSize("+width+"x"+height+")");
         try {
             mCameraOpenCloseLock.acquire();
+            if( !cacPreviewSize(width, height) ) {
+                mCameraOpenCloseLock.release();
+                return;
+            }
             if (null != mCaptureSession) {
+                Log.d(LOGTAG, "closing existing previewSession");
                 mCaptureSession.close();
                 mCaptureSession = null;
             }
