From a32004f90cfd20859f9dc906a460a35fc0ac00e3 Mon Sep 17 00:00:00 2001
From: Andrey Pavlenko <andrey.pavlenko@itseez.com>
Date: Fri, 28 Sep 2012 16:12:59 +0400
Subject: [PATCH] adding initial version of a sample with new Camera-View
 handling design

---
 samples/android/CMakeLists.txt                |   2 +
 samples/android/camera-preview/.classpath     |   8 +
 samples/android/camera-preview/.project       |  33 ++
 .../.settings/org.eclipse.jdt.core.prefs      |   5 +
 .../camera-preview/AndroidManifest.xml        |  27 ++
 samples/android/camera-preview/CMakeLists.txt |   6 +
 .../res/drawable/ic_action_search.png         | Bin 0 -> 3120 bytes
 .../res/drawable/ic_launcher.png              | Bin 0 -> 3014 bytes
 .../res/layout/activity_camera_writer.xml     |  13 +
 .../res/menu/activity_camera_writer.xml       |   6 +
 .../camera-preview/res/values-v11/styles.xml  |   5 +
 .../camera-preview/res/values/strings.xml     |   7 +
 .../camera-preview/res/values/styles.xml      |   5 +
 .../camerawriter/CameraWriterActivity.java    |  72 +++++
 .../OpenCvCameraBridgeViewBase.java           | 301 ++++++++++++++++++
 .../camerawriter/OpenCvNativeCameraView.java  | 126 ++++++++
 16 files changed, 616 insertions(+)
 create mode 100644 samples/android/camera-preview/.classpath
 create mode 100644 samples/android/camera-preview/.project
 create mode 100644 samples/android/camera-preview/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 samples/android/camera-preview/AndroidManifest.xml
 create mode 100644 samples/android/camera-preview/CMakeLists.txt
 create mode 100644 samples/android/camera-preview/res/drawable/ic_action_search.png
 create mode 100644 samples/android/camera-preview/res/drawable/ic_launcher.png
 create mode 100644 samples/android/camera-preview/res/layout/activity_camera_writer.xml
 create mode 100644 samples/android/camera-preview/res/menu/activity_camera_writer.xml
 create mode 100644 samples/android/camera-preview/res/values-v11/styles.xml
 create mode 100644 samples/android/camera-preview/res/values/strings.xml
 create mode 100644 samples/android/camera-preview/res/values/styles.xml
 create mode 100644 samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraWriterActivity.java
 create mode 100644 samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvCameraBridgeViewBase.java
 create mode 100644 samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvNativeCameraView.java

diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt
index bf96bdf5a..097e02d8c 100644
--- a/samples/android/CMakeLists.txt
+++ b/samples/android/CMakeLists.txt
@@ -17,6 +17,8 @@ add_subdirectory(tutorial-2-opencvcamera)
 add_subdirectory(tutorial-3-native)
 add_subdirectory(tutorial-4-mixed)
 
+add_subdirectory(camera-preview)
+
 #hello-android sample
 if(HAVE_opencv_highgui)
   ocv_include_modules_recurse(opencv_highgui opencv_core)
diff --git a/samples/android/camera-preview/.classpath b/samples/android/camera-preview/.classpath
new file mode 100644
index 000000000..a4763d1ee
--- /dev/null
+++ b/samples/android/camera-preview/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/samples/android/camera-preview/.project b/samples/android/camera-preview/.project
new file mode 100644
index 000000000..d8e9953e8
--- /dev/null
+++ b/samples/android/camera-preview/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>CameraWriter</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/samples/android/camera-preview/.settings/org.eclipse.jdt.core.prefs b/samples/android/camera-preview/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..53e049515
--- /dev/null
+++ b/samples/android/camera-preview/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Jun 29 04:36:40 MSD 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/samples/android/camera-preview/AndroidManifest.xml b/samples/android/camera-preview/AndroidManifest.xml
new file mode 100644
index 000000000..8be9e9485
--- /dev/null
+++ b/samples/android/camera-preview/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.opencv.test.camerawriter"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-sdk android:minSdkVersion="8" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".CameraWriterActivity"
+            android:label="@string/title_activity_camera_writer" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/samples/android/camera-preview/CMakeLists.txt b/samples/android/camera-preview/CMakeLists.txt
new file mode 100644
index 000000000..b04c24a37
--- /dev/null
+++ b/samples/android/camera-preview/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(sample example-camera-preview)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+  add_dependencies(opencv_android_examples ${sample})
+endif()
diff --git a/samples/android/camera-preview/res/drawable/ic_action_search.png b/samples/android/camera-preview/res/drawable/ic_action_search.png
new file mode 100644
index 0000000000000000000000000000000000000000..67de12decbd60613f6716de113daae46dc7d6ff9
GIT binary patch
literal 3120
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

literal 0
HcmV?d00001

diff --git a/samples/android/camera-preview/res/drawable/ic_launcher.png b/samples/android/camera-preview/res/drawable/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..a301d5795aaa4bc1d6b829815ca4515f44f4b394
GIT binary patch
literal 3014
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
IM6N<$f-2OxfB*mh

literal 0
HcmV?d00001

diff --git a/samples/android/camera-preview/res/layout/activity_camera_writer.xml b/samples/android/camera-preview/res/layout/activity_camera_writer.xml
new file mode 100644
index 000000000..2e27d58ad
--- /dev/null
+++ b/samples/android/camera-preview/res/layout/activity_camera_writer.xml
@@ -0,0 +1,13 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+	<view class="org.opencv.test.camerawriter.OpenCvNativeCameraView"
+	android:id="@+id/camera_surface_view"
+	android:layout_width = "fill_parent"
+	android:layout_height="fill_parent"
+    />
+
+
+</RelativeLayout>
diff --git a/samples/android/camera-preview/res/menu/activity_camera_writer.xml b/samples/android/camera-preview/res/menu/activity_camera_writer.xml
new file mode 100644
index 000000000..cfc10fd52
--- /dev/null
+++ b/samples/android/camera-preview/res/menu/activity_camera_writer.xml
@@ -0,0 +1,6 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menu_settings"
+        android:title="@string/menu_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>
diff --git a/samples/android/camera-preview/res/values-v11/styles.xml b/samples/android/camera-preview/res/values-v11/styles.xml
new file mode 100644
index 000000000..d408cbc37
--- /dev/null
+++ b/samples/android/camera-preview/res/values-v11/styles.xml
@@ -0,0 +1,5 @@
+<resources>
+
+    <style name="AppTheme" parent="android:Theme.Holo.Light" />
+
+</resources>
\ No newline at end of file
diff --git a/samples/android/camera-preview/res/values/strings.xml b/samples/android/camera-preview/res/values/strings.xml
new file mode 100644
index 000000000..52c8f4b56
--- /dev/null
+++ b/samples/android/camera-preview/res/values/strings.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <string name="app_name">CameraWriter</string>
+    <string name="menu_settings">Settings</string>
+    <string name="title_activity_camera_writer">CameraWriterActivity</string>
+
+</resources>
\ No newline at end of file
diff --git a/samples/android/camera-preview/res/values/styles.xml b/samples/android/camera-preview/res/values/styles.xml
new file mode 100644
index 000000000..4dba0d0a4
--- /dev/null
+++ b/samples/android/camera-preview/res/values/styles.xml
@@ -0,0 +1,5 @@
+<resources>
+
+    <style name="AppTheme" parent="android:Theme.Light" />
+
+</resources>
\ No newline at end of file
diff --git a/samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraWriterActivity.java b/samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraWriterActivity.java
new file mode 100644
index 000000000..4f9027db4
--- /dev/null
+++ b/samples/android/camera-preview/src/org/opencv/test/camerawriter/CameraWriterActivity.java
@@ -0,0 +1,72 @@
+package org.opencv.test.camerawriter;
+
+import org.opencv.android.BaseLoaderCallback;
+import org.opencv.android.LoaderCallbackInterface;
+import org.opencv.android.OpenCVLoader;
+import org.opencv.core.Mat;
+import org.opencv.test.camerawriter.OpenCvCameraBridgeViewBase.CvCameraViewListener;
+
+import android.os.Bundle;
+import android.app.Activity;
+import android.util.Log;
+import android.view.Menu;
+
+public class CameraWriterActivity extends Activity implements CvCameraViewListener {
+
+    protected static final String TAG = "CameraWriterActivity";
+
+
+        private OpenCvCameraBridgeViewBase mCameraView;
+
+
+    private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
+	@Override
+	public void onManagerConnected(int status) {
+	   switch (status) {
+	       case LoaderCallbackInterface.SUCCESS:
+		      Log.i(TAG, "OpenCV loaded successfully");
+		      // Create and set View
+		      mCameraView.setMaxFrameSize(640, 480);
+		      mCameraView.enableView();
+		      break;
+	       default:
+	      super.onManagerConnected(status);
+		break;
+	   }
+	}
+    };
+
+        @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_camera_writer);
+
+        mCameraView = (OpenCvCameraBridgeViewBase)findViewById(R.id.camera_surface_view);
+        mCameraView.setCvCameraViewListener(this);
+        OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_2, this, mLoaderCallback);
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.activity_camera_writer, menu);
+        return true;
+    }
+
+        @Override
+        public void onCameraViewStarted(int width, int height) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void onCameraViewStopped() {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public Mat onCameraFrame(Mat inputFrame) {
+                return inputFrame;
+        }
+}
diff --git a/samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvCameraBridgeViewBase.java b/samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvCameraBridgeViewBase.java
new file mode 100644
index 000000000..0395cbd6e
--- /dev/null
+++ b/samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvCameraBridgeViewBase.java
@@ -0,0 +1,301 @@
+package org.opencv.test.camerawriter;
+
+import java.util.List;
+
+import org.opencv.android.Utils;
+import org.opencv.core.Mat;
+import org.opencv.core.Size;
+import org.opencv.highgui.Highgui;
+import org.opencv.highgui.VideoCapture;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+
+/**
+ * This is a basic class, implementing the interaction with Camera and OpenCV library.
+ * The main responsibility of it - is to control when camera can be enabled, process the frame,
+ * call external listener to make any adjustments to the frame and then draw the resulting
+ * frame to the screen.
+ * The clients shall implement CvCameraViewListener
+ */
+public abstract class OpenCvCameraBridgeViewBase extends SurfaceView implements SurfaceHolder.Callback {
+
+        private static final int MAX_UNSPECIFIED = -1;
+
+        protected int mFrameWidth;
+        protected int mFrameHeight;
+
+        protected int mMaxHeight;
+        protected int mMaxWidth;
+
+        private Bitmap mCacheBitmap;
+
+
+        public OpenCvCameraBridgeViewBase(Context context, AttributeSet attrs) {
+                super(context,attrs);
+                getHolder().addCallback(this);
+                mMaxWidth = MAX_UNSPECIFIED;
+                mMaxHeight = MAX_UNSPECIFIED;
+
+        }
+
+        public interface CvCameraViewListener {
+                /**
+                 * This method is invoked when camera preview has started. After this method is invoked
+                 * the frames will start to be delivered to client via the onCameraFrame() callback.
+                 * @param width -  the width of the frames that will be delivered
+                 * @param height - the height of the frames that will be delivered
+                 */
+                public void onCameraViewStarted(int width, int height);
+
+                /**
+                 * This method is invoked when camera preview has been stopped for some reason.
+                 * No frames will be delivered via onCameraFrame() callback after this method is called.
+                 */
+                public void onCameraViewStopped();
+
+                /**
+                 * This method is invoked when delivery of the frame needs to be done.
+                 * The returned values - is a modified frame which needs to be displayed on the screen.
+                 */
+                public Mat onCameraFrame(Mat inputFrame);
+
+        }
+
+
+        private static final int STOPPED = 0;
+        private static final int STARTED = 1;
+        private  static final String TAG = "SampleCvBase";
+
+        private CvCameraViewListener mListener;
+        private int mState = STOPPED;
+
+        private boolean mEnabled;
+        private boolean mSurfaceExist;
+
+
+
+        private Object mSyncObject = new Object();
+
+        public void surfaceChanged(SurfaceHolder arg0, int arg1, int arg2, int arg3) {
+                synchronized(mSyncObject) {
+                        if (!mSurfaceExist) {
+                                mSurfaceExist = true;
+                                checkCurrentState();
+                        } else {
+                                /** Surface changed. We need to stop camera and restart with new parameters */
+                                /* Pretend that old surface has been destroyed */
+                                mSurfaceExist = false;
+                                checkCurrentState();
+                                /* Now use new surface. Say we have it now */
+                                mSurfaceExist = true;
+                                checkCurrentState();
+                        }
+                }
+        }
+
+        public void surfaceCreated(SurfaceHolder holder) {
+                /* Do nothing. Wait until surfaceChanged delivered */
+        }
+
+        public void surfaceDestroyed(SurfaceHolder holder) {
+                synchronized(mSyncObject) {
+                        mSurfaceExist = false;
+                        checkCurrentState();
+                }
+        }
+
+
+        /**
+         * This method is provided for clients, so they can enable the camera connection.
+         * The actuall onCameraViewStarted callback will be delivered only after both this method is called and surface is available
+         */
+        public void enableView() {
+                synchronized(mSyncObject) {
+                        mEnabled = true;
+                        checkCurrentState();
+                }
+        }
+
+        /**
+         * This method is provided for clients, so they can disable camera connection and stop
+         * the delivery of frames eventhough the surfaceview itself is not destroyed and still stays on the scren
+         */
+        public void disableView() {
+                synchronized(mSyncObject) {
+                        mEnabled = false;
+                        checkCurrentState();
+                }
+        }
+
+
+        public void setCvCameraViewListener(CvCameraViewListener listener) {
+                mListener = listener;
+        }
+
+        /**
+         * This method sets the maximum size that camera frame is allowed to be. When selecting
+         * size - the biggest size which less or equal the size set will be selected.
+         * As an example - we set setMaxFrameSize(200,200) and we have 176x152 and 320x240 sizes. The
+         * preview frame will be selected with 176x152 size.
+         * This method is usefull when need to restrict the size of preview frame for some reason (for example for video recording)
+         * @param maxWidth - the maximum width allowed for camera frame.
+         * @param maxHeight - the maxumum height allowed for camera frame
+         */
+        public void setMaxFrameSize(int maxWidth, int maxHeight) {
+                mMaxWidth = maxWidth;
+                mMaxHeight = maxHeight;
+        }
+
+        /**
+         * Called when mSyncObject lock is held
+         */
+        private void checkCurrentState() {
+                int targetState;
+
+                if (mEnabled && mSurfaceExist) {
+                        targetState = STARTED;
+                } else {
+                        targetState = STOPPED;
+                }
+
+                if (targetState != mState) {
+                        /* The state change detected. Need to exit the current state and enter target state */
+                        processExitState(mState);
+                        mState = targetState;
+                        processEnterState(mState);
+                }
+        }
+
+        private void processEnterState(int state) {
+                switch(state) {
+                case STARTED:
+                        onEnterStartedState();
+                        if (mListener != null) {
+                                mListener.onCameraViewStarted(mFrameWidth, mFrameHeight);
+                        }
+                        break;
+                case STOPPED:
+                        onEnterStoppedState();
+                        if (mListener != null) {
+                                mListener.onCameraViewStopped();
+                        }
+                        break;
+                };
+        }
+
+
+        private void processExitState(int state) {
+                switch(state) {
+                case STARTED:
+                        onExitStartedState();
+                        break;
+                case STOPPED:
+                        onExitStoppedState();
+                        break;
+                };
+        }
+
+        private void onEnterStoppedState() {
+                /* nothing to do */
+        }
+
+        private void onExitStoppedState() {
+                /* nothing to do */
+        }
+
+        private void onEnterStartedState() {
+
+                connectCamera(getWidth(), getHeight());
+                /* Now create cahe Bitmap */
+                mCacheBitmap = Bitmap.createBitmap(mFrameWidth, mFrameHeight, Bitmap.Config.ARGB_8888);
+
+        }
+
+        private void onExitStartedState() {
+
+                disconnectCamera();
+                if (mCacheBitmap != null) {
+                        mCacheBitmap.recycle();
+                }
+        }
+
+
+        /**
+         * This method shall be called by the subclasses when they have valid
+         * object and want it to be delivered to external client (via callback) and
+         * then displayed on the screen.
+         * @param frame - the current frame to be delivered
+         */
+        protected void deliverAndDrawFrame(Mat frame) {
+                Mat modified;
+
+                synchronized(mSyncObject) {
+                if (mListener != null) {
+			modified = mListener.onCameraFrame(frame);
+                } else {
+			modified = frame;
+                }
+
+                if (modified != null) {
+                    Utils.matToBitmap(modified, mCacheBitmap);
+                }
+
+                if (mCacheBitmap != null) {
+                    Canvas canvas = getHolder().lockCanvas();
+                    if (canvas != null) {
+                        canvas.drawBitmap(mCacheBitmap, (canvas.getWidth() - mCacheBitmap.getWidth()) / 2, (canvas.getHeight() - mCacheBitmap.getHeight()) / 2, null);
+                        getHolder().unlockCanvasAndPost(canvas);
+                    }
+                }
+                }
+        }
+
+        /**
+         * This method is invoked shall perform concrete operation to initialize the camera.
+         * CONTRACT: as a result of this method variables mFrameWidth and mFrameHeight MUST be
+         * initialized with the size of the Camera frames that will be delivered to external processor.
+         * @param width - the width of this SurfaceView
+         * @param height - the height of this SurfaceView
+         */
+        protected abstract void connectCamera(int width, int height);
+
+        /**
+         * Disconnects and release the particular camera object beeing connected to this surface view.
+         * Called when syncObject lock is held
+         */
+        protected abstract void disconnectCamera();
+
+
+        /**
+         * This helper method can be called by subclasses to select camera preview size.
+         * It goes over the list of the supported preview sizes and selects the maximum one which
+         * fits both values set via setMaxFrameSize() and surface frame allocated for this view
+         * @param supportedSizes
+         * @param surfaceWidth
+         * @param surfaceHeight
+         * @return
+         */
+        protected Size calculateCameraFrameSize(List<Size> supportedSizes, int surfaceWidth, int surfaceHeight) {
+                int calcWidth = 0;
+                int calcHeight = 0;
+
+                int maxAllowedWidth = (mMaxWidth != MAX_UNSPECIFIED && mMaxWidth < surfaceWidth)? mMaxWidth : surfaceWidth;
+                int maxAllowedHeight = (mMaxHeight != MAX_UNSPECIFIED && mMaxHeight < surfaceHeight)? mMaxHeight : surfaceHeight;
+
+        for (Size size : supportedSizes) {
+            if (size.width <= maxAllowedWidth && size.height <= maxAllowedHeight) {
+		if (size.width >= calcWidth && size.height >= calcHeight) {
+                        calcWidth = (int) size.width;
+                        calcHeight = (int) size.height;
+		}
+            }
+        }
+                return new Size(calcWidth, calcHeight);
+        }
+}
diff --git a/samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvNativeCameraView.java b/samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvNativeCameraView.java
new file mode 100644
index 000000000..e7df36df4
--- /dev/null
+++ b/samples/android/camera-preview/src/org/opencv/test/camerawriter/OpenCvNativeCameraView.java
@@ -0,0 +1,126 @@
+package org.opencv.test.camerawriter;
+
+import org.opencv.android.Utils;
+import org.opencv.core.Mat;
+import org.opencv.core.Size;
+import org.opencv.highgui.Highgui;
+import org.opencv.highgui.VideoCapture;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.util.Log;
+
+/**
+ * This class is an implementation of a bridge between SurfaceView and native OpenCV camera.
+ * Due to the big amount of work done, by the base class this child is only responsible
+ * for creating camera, destroying camera and delivering frames while camera is enabled
+ */
+public class OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase {
+
+        public static final String TAG = "OpenCvNativeCameraView";
+        private boolean mStopThread;
+        private Thread mThread;
+        private VideoCapture mCamera;
+
+
+    public OpenCvNativeCameraView(Context context, AttributeSet 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();
+
+        }
+
+        private void initializeCamera(int width, int height) {
+        mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID);
+        //TODO: improve error handling
+
+        java.util.List<Size> sizes = mCamera.getSupportedPreviewSizes();
+
+        /* Select the size that fits surface considering maximum size allowed */
+        Size frameSize = calculateCameraFrameSize(sizes, width, height);
+
+
+        double frameWidth = frameSize.width;
+        double frameHeight = frameSize.height;
+
+
+        mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, frameWidth);
+        mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, frameHeight);
+
+        mFrameWidth = (int)frameWidth;
+        mFrameHeight = (int)frameHeight;
+
+        Log.i(TAG, "Selected camera frame size = (" + mFrameWidth + ", " + mFrameHeight + ")");
+        }
+
+        private void releaseCamera() {
+                if (mCamera != null) {
+                        mCamera.release();
+                }
+        }
+
+        private class CameraWorker implements Runnable {
+
+            private Mat mRgba = new Mat();
+            private int mWidth;
+            private int mHeight;
+
+            CameraWorker(int w, int h) {
+		mWidth = w;
+		mHeight = h;
+            }
+
+                @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);
+
+                    deliverAndDrawFrame(mRgba);
+
+                        } while (!mStopThread);
+
+                }
+        }
+
+}