Auto focus added;

Old Android support added;
Android 4.1.x fixes added;
Thead sync added;
Camera errors handling added.

samples/android/15-puzzle-framework/src/org/opencv/framework/OpenCvJavaCameraView.java

@@ -27,94 +27,94 @@ import org.opencv.imgproc.Imgproc;
  */
 public class OpenCvJavaCameraView extends OpenCvCameraBridgeViewBase implements PreviewCallback {
 
-        private static final int MAGIC_TEXTURE_ID = 10;
-        private static final String TAG = "OpenCvJavaCameraView";
+    private static final int MAGIC_TEXTURE_ID = 10;
+    private static final String TAG = "OpenCvJavaCameraView";
 
-        private Mat mBaseMat;
+    private Mat mBaseMat;
 
-        public static class JavaCameraSizeAccessor implements ListItemAccessor {
+    public static class JavaCameraSizeAccessor implements ListItemAccessor {
 
-                @Override
-                public int getWidth(Object obj) {
-                        Camera.Size size = (Camera.Size) obj;
-                        return size.width;
-                }
-
-                @Override
-                public int getHeight(Object obj) {
-                        Camera.Size size = (Camera.Size) obj;
-                        return size.height;
-                }
+        @Override
+        public int getWidth(Object obj) {
+            Camera.Size size = (Camera.Size) obj;
+            return size.width;
+        }
 
+        @Override
+        public int getHeight(Object obj) {
+            Camera.Size size = (Camera.Size) obj;
+            return size.height;
         }
 
+    }
+
     private Camera mCamera;
 
-        public OpenCvJavaCameraView(Context context, AttributeSet attrs) {
-                super(context, attrs);
-        }
+    public OpenCvJavaCameraView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
 
 
 
-        @Override
-        protected void connectCamera(int width, int height) {
-                mCamera = Camera.open(0);
+    @Override
+    protected void connectCamera(int width, int height) {
+        mCamera = Camera.open(0);
 
-                List<android.hardware.Camera.Size> sizes = mCamera.getParameters().getSupportedPreviewSizes();
+        List<android.hardware.Camera.Size> sizes = mCamera.getParameters().getSupportedPreviewSizes();
         /* Select the size that fits surface considering maximum size allowed */
         FrameSize frameSize = calculateCameraFrameSize(sizes, new JavaCameraSizeAccessor(), width, height);
 
         /* Now set camera parameters */
         try {
-		Camera.Parameters params = mCamera.getParameters();
+            Camera.Parameters params = mCamera.getParameters();
 
-		List<Integer> formats = params.getSupportedPictureFormats();
+            List<Integer> formats = params.getSupportedPictureFormats();
 
-		params.setPreviewFormat(ImageFormat.NV21);
-		params.setPreviewSize(frameSize.width, frameSize.height);
+            params.setPreviewFormat(ImageFormat.NV21);
+            params.setPreviewSize(frameSize.width, frameSize.height);
 
-		mCamera.setPreviewCallback(this);
-		mCamera.setParameters(params);
-                        //mCamera.setPreviewTexture(new SurfaceTexture(MAGIC_TEXTURE_ID));
+            mCamera.setPreviewCallback(this);
+            mCamera.setParameters(params);
+            //mCamera.setPreviewTexture(new SurfaceTexture(MAGIC_TEXTURE_ID));
 
-		SurfaceTexture tex = new SurfaceTexture(MAGIC_TEXTURE_ID);
+            SurfaceTexture tex = new SurfaceTexture(MAGIC_TEXTURE_ID);
 
-		mCamera.setPreviewTexture(tex);
+            mCamera.setPreviewTexture(tex);
 
-                        mFrameWidth = frameSize.width;
-                        mFrameHeight = frameSize.height;
+            mFrameWidth = frameSize.width;
+            mFrameHeight = frameSize.height;
 
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
 
-                mBaseMat = new Mat(mFrameHeight + (mFrameHeight/2), mFrameWidth, CvType.CV_8UC1);
+        mBaseMat = new Mat(mFrameHeight + (mFrameHeight/2), mFrameWidth, CvType.CV_8UC1);
 
         /* Finally we are ready to start the preview */
-                mCamera.startPreview();
-        }
+        mCamera.startPreview();
+    }
 
-        @Override
-        protected void disconnectCamera() {
+    @Override
+    protected void disconnectCamera() {
 
-                mCamera.setPreviewCallback(null);
-                mCamera.stopPreview();
-                mCamera.release();
-        }
+        mCamera.setPreviewCallback(null);
+        mCamera.stopPreview();
+        mCamera.release();
+    }
 
 
 
-        @Override
-        public void onPreviewFrame(byte[] frame, Camera arg1) {
-                Log.i(TAG, "Preview Frame received. Need to create MAT and deliver it to clients");
+    @Override
+    public void onPreviewFrame(byte[] frame, Camera arg1) {
+        Log.i(TAG, "Preview Frame received. Need to create MAT and deliver it to clients");
 
-                Log.i(TAG, "Frame size  is " + frame.length);
+        Log.i(TAG, "Frame size  is " + frame.length);
 
-                mBaseMat.put(0, 0, frame);
-                Mat frameMat = new Mat();
-                Imgproc.cvtColor(mBaseMat, frameMat, Imgproc.COLOR_YUV2RGBA_NV21, 4);
-                deliverAndDrawFrame(frameMat);
-                frameMat.release();
-        }
+        mBaseMat.put(0, 0, frame);
+        Mat frameMat = new Mat();
+        Imgproc.cvtColor(mBaseMat, frameMat, Imgproc.COLOR_YUV2RGBA_NV21, 4);
+        deliverAndDrawFrame(frameMat);
+        frameMat.release();
+    }
 
 }

samples/android/15-puzzle-framework/src/org/opencv/framework/OpenCvNativeCameraView.java

@@ -19,68 +19,68 @@ import android.util.Log;
  */
 public class OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase {
 
-        public static final String TAG = "OpenCvNativeCameraView";
-        private boolean mStopThread;
-        private Thread mThread;
-        private VideoCapture mCamera;
+    public static final String TAG = "OpenCvNativeCameraView";
+    private boolean mStopThread;
+    private Thread mThread;
+    private VideoCapture mCamera;
 
 
     public OpenCvNativeCameraView(Context context, AttributeSet attrs) {
-                super(context, attrs);
+        super(context, attrs);
+    }
+
+
+    @Override
+    protected void connectCamera(int width, int height) {
+
+        /* 1. We need to instantiate camera
+         * 2. We need to start thread which will be getting frames
+         */
+        /* First step - initialize camera connection */
+        initializeCamera(getWidth(), getHeight());
+
+        /* now we can start update thread */
+        mThread = new Thread(new CameraWorker(getWidth(), getHeight()));
+        mThread.start();
+    }
+
+    @Override
+    protected void disconnectCamera() {
+        /* 1. We need to stop thread which updating the frames
+         * 2. Stop camera and release it
+         */
+        try {
+            mStopThread = true;
+            mThread.join();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } finally {
+            mThread =  null;
+            mStopThread = false;
         }
 
+        /* Now release camera */
+        releaseCamera();
 
-        @Override
-        protected void connectCamera(int width, int height) {
+    }
 
-                /* 1. We need to instantiate camera
-                 * 2. We need to start thread which will be getting frames
-                 */
-                /* First step - initialize camera connection */
-                initializeCamera(getWidth(), getHeight());
+    public static class OpenCvSizeAccessor implements ListItemAccessor {
 
-                /* now we can start update thread */
-                mThread = new Thread(new CameraWorker(getWidth(), getHeight()));
-                mThread.start();
+        @Override
+        public int getWidth(Object obj) {
+            Size size  = (Size)obj;
+            return (int)size.width;
         }
 
         @Override
-        protected void disconnectCamera() {
-                /* 1. We need to stop thread which updating the frames
-                 * 2. Stop camera and release it
-                 */
-                try {
-                        mStopThread = true;
-                        mThread.join();
-                } catch (InterruptedException e) {
-                        e.printStackTrace();
-                } finally {
-                        mThread =  null;
-                        mStopThread = false;
-                }
-
-                /* Now release camera */
-                releaseCamera();
-
+        public int getHeight(Object obj) {
+            Size size  = (Size)obj;
+            return (int)size.height;
         }
 
-        public static class OpenCvSizeAccessor implements ListItemAccessor {
-
-                @Override
-                public int getWidth(Object obj) {
-                        Size size  = (Size)obj;
-                        return (int)size.width;
-                }
-
-                @Override
-                public int getHeight(Object obj) {
-                        Size size  = (Size)obj;
-                        return (int)size.height;
-                }
+    }
 
-        }
-
-        private void initializeCamera(int width, int height) {
+    private void initializeCamera(int width, int height) {
         mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID);
         //TODO: improve error handling
 
@@ -101,42 +101,42 @@ public class OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase {
         mFrameHeight = (int)frameHeight;
 
         Log.i(TAG, "Selected camera frame size = (" + mFrameWidth + ", " + mFrameHeight + ")");
-        }
+    }
 
-        private void releaseCamera() {
-                if (mCamera != null) {
-                        mCamera.release();
-                }
+    private void releaseCamera() {
+        if (mCamera != null) {
+            mCamera.release();
         }
+    }
 
-        private class CameraWorker implements Runnable {
+    private class CameraWorker implements Runnable {
 
-            private Mat mRgba = new Mat();
-            private int mWidth;
-            private int mHeight;
+        private Mat mRgba = new Mat();
+        private int mWidth;
+        private int mHeight;
 
-            CameraWorker(int w, int h) {
-		mWidth = w;
-		mHeight = h;
-            }
+        CameraWorker(int w, int h) {
+            mWidth = w;
+            mHeight = h;
+        }
 
-                @Override
-                public void run() {
-                        Mat modified;
+        @Override
+        public void run() {
+            Mat modified;
 
 
-                        do {
-                                if (!mCamera.grab()) {
-                                        Log.e(TAG, "Camera frame grab failed");
-                                        break;
-                                }
-                    mCamera.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
+            do {
+                if (!mCamera.grab()) {
+                    Log.e(TAG, "Camera frame grab failed");
+                    break;
+                }
+                mCamera.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
 
-                    deliverAndDrawFrame(mRgba);
+                deliverAndDrawFrame(mRgba);
 
-                        } while (!mStopThread);
+            } while (!mStopThread);
 
-                }
         }
+    }
 
 }