From c1d42664bc1919251d761d2d5fc7b7697775bbae Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 23 Oct 2012 17:35:29 +0400
Subject: [PATCH] Refactring. Bug fix.

---
 .../generator/src/java/android+JavaCameraView.java | 31 +++++++++++++---------
 samples/android/15-puzzle/AndroidManifest.xml      |  2 ++
 .../ImageManipulationsActivity.java                |  1 +
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/modules/java/generator/src/java/android+JavaCameraView.java b/modules/java/generator/src/java/android+JavaCameraView.java
index a4ab627..e3e80c6 100644
--- a/modules/java/generator/src/java/android+JavaCameraView.java
+++ b/modules/java/generator/src/java/android+JavaCameraView.java
@@ -57,13 +57,16 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
 
     public JavaCameraView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        Log.d(TAG, "Java camera view ctor");
     }
 
     @TargetApi(11)
     protected boolean initializeCamera(int width, int height) {
+        Log.d(TAG, "Initialize java camera");
         synchronized (this) {
             mCamera = null;
 
+            Log.d(TAG, "Trying to open camera with old open()");
             try {
                 mCamera = Camera.open();
             }
@@ -72,31 +75,30 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
             }
 
             if(mCamera == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
+                boolean connected = false;
                 for (int camIdx = 0; camIdx < Camera.getNumberOfCameras(); ++camIdx) {
+                    Log.d(TAG, "Trying to open camera with new open(" + Integer.valueOf(camIdx) + ")");
                     try {
                         mCamera = Camera.open(camIdx);
-                    }
-                    catch (RuntimeException e) {
+                        connected = true;
+                    } catch (RuntimeException e) {
                         Log.e(TAG, "Camera #" + camIdx + "failed to open: " + e.getLocalizedMessage());
                     }
+                    if (connected) break;
                 }
             }
 
             if (mCamera == null)
                 return false;
 
-            mCamera.setPreviewCallbackWithBuffer(this);
-
-            List<android.hardware.Camera.Size> sizes = mCamera.getParameters().getSupportedPreviewSizes();
-            /* Select the size that fits surface considering maximum size allowed */
-            Size frameSize = calculateCameraFrameSize(sizes, new JavaCameraSizeAccessor(), width, height);
-
-            mFrameWidth = (int)frameSize.width;
-            mFrameHeight = (int)frameSize.height;
-
             /* Now set camera parameters */
             try {
                 Camera.Parameters params = mCamera.getParameters();
+                Log.d(TAG, "getSupportedPreviewSizes()");
+                List<android.hardware.Camera.Size> sizes = params.getSupportedPreviewSizes();
+
+                /* Select the size that fits surface considering maximum size allowed */
+                Size frameSize = calculateCameraFrameSize(sizes, new JavaCameraSizeAccessor(), width, height);
 
                 params.setPreviewFormat(ImageFormat.NV21);
                 params.setPreviewSize((int)frameSize.width, (int)frameSize.height);
@@ -110,11 +112,15 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
                 mCamera.setParameters(params);
                 params = mCamera.getParameters();
 
-                int size = params.getPreviewSize().width * params.getPreviewSize().height;
+                mFrameWidth = params.getPreviewSize().width;
+                mFrameHeight = params.getPreviewSize().height;
+
+                int size = mFrameWidth * mFrameHeight;
                 size  = size * ImageFormat.getBitsPerPixel(params.getPreviewFormat()) / 8;
                 mBuffer = new byte[size];
 
                 mCamera.addCallbackBuffer(mBuffer);
+                mCamera.setPreviewCallbackWithBuffer(this);
 
                 mBaseMat = new Mat(mFrameHeight + (mFrameHeight/2), mFrameWidth, CvType.CV_8UC1);
 
@@ -131,6 +137,7 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
             }
 
             /* Finally we are ready to start the preview */
+            Log.d(TAG, "startPreview");
             mCamera.startPreview();
         }
 
diff --git a/samples/android/15-puzzle/AndroidManifest.xml b/samples/android/15-puzzle/AndroidManifest.xml
index ad0e699..184d3d7 100644
--- a/samples/android/15-puzzle/AndroidManifest.xml
+++ b/samples/android/15-puzzle/AndroidManifest.xml
@@ -23,6 +23,8 @@
         </activity>
     </application>
 
+    <uses-permission android:name="android.permission.CAMERA"/>
+
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
index 293f8d8..19744f9 100644
--- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
+++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java
@@ -259,6 +259,7 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView
     }
 
     public Mat onCameraFrame(Mat inputFrame) {
+        inputFrame.copyTo(mRgba);
 
         switch (ImageManipulationsActivity.viewMode) {
         case ImageManipulationsActivity.VIEW_MODE_RGBA:
-- 
2.7.4