Skip to content

O
opencv
Commit 9d6ccecf authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Fixed layout in third Android tutorial

parent 915169e8
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 231 deletions
doc/_themes/blue/static/default.css_t
View file @ 9d6ccecf
...@@ -175,6 +175,8 @@ a:hover { ...@@ -175,6 +175,8 @@ a:hover {
div.body p, div.body dd, div.body li { div.body p, div.body dd, div.body li {
text-align: justify; text-align: justify;
line-height: 130%; line-height: 130%;
margin-top: 1em;
margin-bottom: 1em;
} }
div.body h1, div.body h1,
...@@ -327,16 +329,16 @@ table.field-list { ...@@ -327,16 +329,16 @@ table.field-list {
margin-top: 20px; margin-top: 20px;
} }
ul.simple { /*ul.simple {
list-style: none; list-style: none;
} }*/
em.menuselection, em.guilabel { em.menuselection, em.guilabel {
font-family: {{ theme_guifont }}; font-family: {{ theme_guifont }};
} }
.enumeratevisibleitemswithsquare ul { .enumeratevisibleitemswithsquare ul {
list-style: square; list-style: square;
margin-bottom: 0px; margin-bottom: 0px;
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;
...@@ -349,25 +351,25 @@ margin-left: 0px; ...@@ -349,25 +351,25 @@ margin-left: 0px;
margin-right: 0px; margin-right: 0px;
margin-top: 0.2em; margin-top: 0.2em;
} }
.enumeratevisibleitemswithsquare p { .enumeratevisibleitemswithsquare p {
margin-bottom: 0pt; margin-bottom: 0pt;
margin-top: 1pt; margin-top: 1pt;
} }
.enumeratevisibleitemswithsquare dl{ .enumeratevisibleitemswithsquare dl{
margin-bottom: 0px; margin-bottom: 0px;
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;
margin-top: 0px; margin-top: 0px;
} }
.toctableopencv .toctableopencv
{ {
width: 100% ; width: 100% ;
table-layout: fixed; table-layout: fixed;
} }
.toctableopencv colgroup col:first-child .toctableopencv colgroup col:first-child
{ {
...@@ -375,12 +377,17 @@ margin-top: 0px; ...@@ -375,12 +377,17 @@ margin-top: 0px;
max-width: 100pt !important; max-width: 100pt !important;
min-width: 100pt !important; min-width: 100pt !important;
} }
.toctableopencv colgroup col:nth-child(2) .toctableopencv colgroup col:nth-child(2)
{ {
width: 100% !important; width: 100% !important;
} }
div.body ul.search li { div.body ul.search li {
text-align: left; text-align: left;
} }
div.linenodiv {
min-width: 1em;
text-align: right;
}
\ No newline at end of file
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
View file @ 9d6ccecf
...@@ -57,12 +57,12 @@ Using async initialization is a **recommended** way for application development. ...@@ -57,12 +57,12 @@ Using async initialization is a **recommended** way for application development.
To run OpenCV Manager-based application the first time you need to install packages with the `OpenCV Manager` and `OpenCV binary pack` for you platform. To run OpenCV Manager-based application the first time you need to install packages with the `OpenCV Manager` and `OpenCV binary pack` for you platform.
You can do it using Google Play Market or manually with ``adb`` tool: You can do it using Google Play Market or manually with ``adb`` tool:
.. code-block:: sh .. code-block:: sh
:linenos: :linenos:
<Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.2_Manager.apk <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.2_Manager.apk
<Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.2_binary_pack_armv7a.apk <Android SDK path>/platform-tools/adb install <OpenCV4Android SDK path>/apk/OpenCV_2.4.2_binary_pack_armv7a.apk
There is a very base code snippet implementing the async initialization. It shows basic principles. See the "15-puzzle" OpenCV sample for details. There is a very base code snippet implementing the async initialization. It shows basic principles. See the "15-puzzle" OpenCV sample for details.
.. code-block:: java .. code-block:: java
...@@ -107,7 +107,7 @@ There is a very base code snippet implementing the async initialization. It show ...@@ -107,7 +107,7 @@ There is a very base code snippet implementing the async initialization. It show
} }
It this case application works with OpenCV Manager in asynchronous fashion. ``OnManagerConnected`` callback will be called in UI thread, when initialization finishes. It this case application works with OpenCV Manager in asynchronous fashion. ``OnManagerConnected`` callback will be called in UI thread, when initialization finishes.
Please note, that it is not allowed to use OpenCV calls or load OpenCV-dependent native libs before invoking this callback. Please note, that it is not allowed to use OpenCV calls or load OpenCV-dependent native libs before invoking this callback.
Load your own native libraries that depend on OpenCV after the successful OpenCV initialization. Load your own native libraries that depend on OpenCV after the successful OpenCV initialization.
Application development with static initialization Application development with static initialization
...@@ -130,27 +130,27 @@ This approach is deprecated for the production code, release package is recommen ...@@ -130,27 +130,27 @@ This approach is deprecated for the production code, release package is recommen
:align: center :align: center
#. If your application project **doesn't have a JNI part**, just copy the corresponding OpenCV native libs from :file:`<OpenCV-2.4.2-android-sdk>/sdk/native/libs/<target_arch>` to your project directory to folder :file:`libs/<target_arch>`. #. If your application project **doesn't have a JNI part**, just copy the corresponding OpenCV native libs from :file:`<OpenCV-2.4.2-android-sdk>/sdk/native/libs/<target_arch>` to your project directory to folder :file:`libs/<target_arch>`.
In case of the application project **with a JNI part**, instead of manual libraries copying you need to modify your ``Android.mk`` file: In case of the application project **with a JNI part**, instead of manual libraries copying you need to modify your ``Android.mk`` file:
add the following two code lines after the ``"include $(CLEAR_VARS)"`` and before ``"include path_to_OpenCV-2.4.2-android-sdk/sdk/native/jni/OpenCV.mk"`` add the following two code lines after the ``"include $(CLEAR_VARS)"`` and before ``"include path_to_OpenCV-2.4.2-android-sdk/sdk/native/jni/OpenCV.mk"``
.. code-block:: make .. code-block:: make
:linenos: :linenos:
OPENCV_CAMERA_MODULES:=on
OPENCV_INSTALL_MODULES:=on
OPENCV_CAMERA_MODULES:=on
OPENCV_INSTALL_MODULES:=on
The result should look like the following: The result should look like the following:
.. code-block:: make .. code-block:: make
:linenos: :linenos:
include $(CLEAR_VARS) include $(CLEAR_VARS)
# OpenCV # OpenCV
OPENCV_CAMERA_MODULES:=on OPENCV_CAMERA_MODULES:=on
OPENCV_INSTALL_MODULES:=on OPENCV_INSTALL_MODULES:=on
include ../../sdk/native/jni/OpenCV.mk include ../../sdk/native/jni/OpenCV.mk
After that the OpenCV libraries will be copied to your application :file:`libs` folder during the JNI part build. After that the OpenCV libraries will be copied to your application :file:`libs` folder during the JNI part build.
...@@ -159,28 +159,28 @@ This approach is deprecated for the production code, release package is recommen ...@@ -159,28 +159,28 @@ This approach is deprecated for the production code, release package is recommen
#. The last step of enabling OpenCV in your application is Java initialization code before call to OpenCV API. #. The last step of enabling OpenCV in your application is Java initialization code before call to OpenCV API.
It can be done, for example, in the static section of the ``Activity`` class: It can be done, for example, in the static section of the ``Activity`` class:
.. code-block:: java .. code-block:: java
:linenos: :linenos:
static { static {
if (!OpenCVLoader.initDebug()) { if (!OpenCVLoader.initDebug()) {
// Handle initialization error // Handle initialization error
} }
} }
If you application includes other OpenCV-dependent native libraries you should load them **after** OpenCV initialization: If you application includes other OpenCV-dependent native libraries you should load them **after** OpenCV initialization:
.. code-block:: java .. code-block:: java
:linenos: :linenos:
static { static {
if (!OpenCVLoader.initDebug()) { if (!OpenCVLoader.initDebug()) {
// Handle initialization error // Handle initialization error
} else { } else {
System.loadLibrary("my_jni_lib1"); System.loadLibrary("my_jni_lib1");
System.loadLibrary("my_jni_lib2"); System.loadLibrary("my_jni_lib2");
} }
} }
Native/C++ Native/C++
---------- ----------
...@@ -198,33 +198,33 @@ To build your own Android application, which uses OpenCV from native part, the f ...@@ -198,33 +198,33 @@ To build your own Android application, which uses OpenCV from native part, the f
.. code-block:: make .. code-block:: make
include C:\Work\OpenCV4Android\OpenCV-2.4.2-android-sdk\sdk\native\jni\OpenCV.mk include C:\Work\OpenCV4Android\OpenCV-2.4.2-android-sdk\sdk\native\jni\OpenCV.mk
should be inserted into the :file:`jni/Android.mk` file **after** the line should be inserted into the :file:`jni/Android.mk` file **after** the line
.. code-block:: make .. code-block:: make
include $(CLEAR_VARS) include $(CLEAR_VARS)
#. Several variables can be used to customize OpenCV stuff, but you **don't need** to use them when your application uses the `async initialization` via the `OpenCV Manager` API. #. Several variables can be used to customize OpenCV stuff, but you **don't need** to use them when your application uses the `async initialization` via the `OpenCV Manager` API.
Note: these variables should be set **before** the ``"include .../OpenCV.mk"`` line: Note: these variables should be set **before** the ``"include .../OpenCV.mk"`` line:
.. code-block:: make .. code-block:: make
OPENCV_INSTALL_MODULES:=on OPENCV_INSTALL_MODULES:=on
Copies necessary OpenCV dynamic libs to the project ``libs`` folder in order to include them into the APK. Copies necessary OpenCV dynamic libs to the project ``libs`` folder in order to include them into the APK.
.. code-block:: make .. code-block:: make
OPENCV_CAMERA_MODULES:=off OPENCV_CAMERA_MODULES:=off
Skip native OpenCV camera related libs copying to the project ``libs`` folder. Skip native OpenCV camera related libs copying to the project ``libs`` folder.
.. code-block:: make .. code-block:: make
OPENCV_LIB_TYPE:=STATIC OPENCV_LIB_TYPE:=STATIC
Perform static link with OpenCV. By default dynamic link is used and the project JNI lib depends on ``libopencv_java.so``. Perform static link with OpenCV. By default dynamic link is used and the project JNI lib depends on ``libopencv_java.so``.
...@@ -232,14 +232,14 @@ To build your own Android application, which uses OpenCV from native part, the f ...@@ -232,14 +232,14 @@ To build your own Android application, which uses OpenCV from native part, the f
.. code-block:: make .. code-block:: make
APP_STL := gnustl_static APP_STL := gnustl_static
APP_CPPFLAGS := -frtti -fexceptions APP_CPPFLAGS := -frtti -fexceptions
Also the line like this one: Also the line like this one:
.. code-block:: make .. code-block:: make
APP_ABI := armeabi-v7a APP_ABI := armeabi-v7a
should specify the application target platforms. should specify the application target platforms.
...@@ -249,11 +249,11 @@ To build your own Android application, which uses OpenCV from native part, the f ...@@ -249,11 +249,11 @@ To build your own Android application, which uses OpenCV from native part, the f
.. code-block:: make .. code-block:: make
APP_PLATFORM := android-9 APP_PLATFORM := android-9
#. Either use :ref:`manual <NDK_build_cli>` ``ndk-build`` invocation or :ref:`setup Eclipse CDT Builder <CDT_Builder>` to build native JNI lib before Java part [re]build and APK creation. #. Either use :ref:`manual <NDK_build_cli>` ``ndk-build`` invocation or :ref:`setup Eclipse CDT Builder <CDT_Builder>` to build native JNI lib before Java part [re]build and APK creation.
Hello OpenCV Sample Hello OpenCV Sample
=================== ===================
...@@ -262,208 +262,217 @@ Here are basic steps to guide you trough the process of creating a simple OpenCV ...@@ -262,208 +262,217 @@ Here are basic steps to guide you trough the process of creating a simple OpenCV
It will be capable of accessing camera output, processing it and displaying the result. It will be capable of accessing camera output, processing it and displaying the result.
#. Open Eclipse IDE, create a new clean workspace, create a new Android project (*File -> New -> Android Project*). #. Open Eclipse IDE, create a new clean workspace, create a new Android project (*File -> New -> Android Project*).
#. Set name, target, package and minSDKVersion accordingly. #. Set name, target, package and minSDKVersion accordingly.
#. Create a new class (*File -> New -> Class*). Name it for example: *HelloOpenCVView*. #. Create a new class (*File -> New -> Class*). Name it for example: *HelloOpenCVView*.
.. image:: images/dev_OCV_new_class.png
:alt: Add a new class.
:align: center
* It should extend *SurfaceView* class. .. image:: images/dev_OCV_new_class.png
:alt: Add a new class.
:align: center
* It also should implement *SurfaceHolder.Callback*, *Runnable*. * It should extend *SurfaceView* class.
* It also should implement *SurfaceHolder.Callback*, *Runnable*.
#. Edit *HelloOpenCVView* class. #. Edit *HelloOpenCVView* class.
* Add an *import* line for *android.content.context*. * Add an *import* line for *android.content.context*.
* Modify autogenerated stubs: *HelloOpenCVView*, *surfaceCreated*, *surfaceDestroyed* and *surfaceChanged*.
* Modify autogenerated stubs: *HelloOpenCVView*, *surfaceCreated*, *surfaceDestroyed* and *surfaceChanged*. .. code-block:: java
.. code-block:: java :linenos:
package com.hello.opencv.test; package com.hello.opencv.test;
import android.content.Context; import android.content.Context;
public class HelloOpenCVView extends SurfaceView implements Callback, Runnable { public class HelloOpenCVView extends SurfaceView implements Callback, Runnable {
public HelloOpenCVView(Context context) {
super(context);
getHolder().addCallback(this);
}
public HelloOpenCVView(Context context) { public void surfaceCreated(SurfaceHolder holder) {
super(context); (new Thread(this)).start();
getHolder().addCallback(this); }
}
public void surfaceCreated(SurfaceHolder holder) {
(new Thread(this)).start();
}
public void surfaceDestroyed(SurfaceHolder holder) {
cameraRelease();
}
public void surfaceChanged(SurfaceHolder holder, int format, int width,
int height) {
cameraSetup(width, height);
}
* Add *cameraOpen*, *cameraRelease* and *cameraSetup* voids as shown below. public void surfaceDestroyed(SurfaceHolder holder) {
cameraRelease();
}
* Also, don't forget to add the public void *run()* as follows: public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
cameraSetup(width, height);
.. code-block:: java }
public void run() { //...
// TODO: loop { getFrame(), processFrame(), drawFrame() }
}
public boolean cameraOpen() { * Add *cameraOpen*, *cameraRelease* and *cameraSetup* voids as shown below.
return false; //TODO: open camera
}
private void cameraRelease() {
// TODO release camera
}
private void cameraSetup(int width, int height) { * Also, don't forget to add the public void *run()* as follows:
// TODO setup camera
}
.. .. code-block:: java
:linenos:
public void run() {
// TODO: loop { getFrame(), processFrame(), drawFrame() }
}
public boolean cameraOpen() {
return false; //TODO: open camera
}
private void cameraRelease() {
// TODO release camera
}
private void cameraSetup(int width, int height) {
// TODO setup camera
}
#. Create a new *Activity* (*New -> Other -> Android -> Android Activity*) and name it, for example: *HelloOpenCVActivity*. For this activity define *onCreate*, *onResume* and *onPause* voids. #. Create a new *Activity* (*New -> Other -> Android -> Android Activity*) and name it, for example: *HelloOpenCVActivity*. For this activity define *onCreate*, *onResume* and *onPause* voids.
.. code-block:: java
.. code-block:: java
public void onCreate (Bundle savedInstanceState) { :linenos:
super.onCreate(savedInstanceState);
mView = new HelloOpenCVView(this); public void onCreate (Bundle savedInstanceState) {
setContentView (mView); super.onCreate(savedInstanceState);
} mView = new HelloOpenCVView(this);
setContentView (mView);
protected void onPause() { }
super.onPause();
mView.cameraRelease(); protected void onPause() {
} super.onPause();
mView.cameraRelease();
protected void onResume() { }
super.onResume();
if( !mView.cameraOpen() ) { protected void onResume() {
// MessageBox and exit app super.onResume();
AlertDialog ad = new AlertDialog.Builder(this).create(); if( !mView.cameraOpen() ) {
ad.setCancelable(false); // This blocks the "BACK" button // MessageBox and exit app
ad.setMessage("Fatal error: can't open camera!"); AlertDialog ad = new AlertDialog.Builder(this).create();
ad.setButton("OK", new DialogInterface.OnClickListener() { ad.setCancelable(false); // This blocks the "BACK" button
public void onClick(DialogInterface dialog, int which) { ad.setMessage("Fatal error: can't open camera!");
dialog.dismiss(); ad.setButton("OK", new DialogInterface.OnClickListener() {
finish(); public void onClick(DialogInterface dialog, int which) {
} dialog.dismiss();
}); finish();
ad.show(); }
} });
ad.show();
} }
}
#. Add the following permissions to the AndroidManifest.xml file: #. Add the following permissions to the AndroidManifest.xml file:
.. code-block:: xml
</application> .. code-block:: xml
:linenos:
</application>
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
#. Reference OpenCV library within your project properties. #. Reference OpenCV library within your project properties.
.. image:: images/dev_OCV_reference.png
:alt: Reference OpenCV library. .. image:: images/dev_OCV_reference.png
:align: center :alt: Reference OpenCV library.
:align: center
#. We now need some code to handle the camera. Update the *HelloOpenCVView* class as follows: #. We now need some code to handle the camera. Update the *HelloOpenCVView* class as follows:
.. code-block:: java
private VideoCapture mCamera;
public boolean cameraOpen() {
synchronized (this) {
cameraRelease();
mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID);
if (!mCamera.isOpened()) {
mCamera.release();
mCamera = null;
Log.e("HelloOpenCVView", "Failed to open native camera");
return false;
}
}
return true;
}
public void cameraRelease() {
synchronized(this) {
if (mCamera != null) {
mCamera.release();
mCamera = null;
}
}
}
private void cameraSetup(int width, int height) {
synchronized (this) {
if (mCamera != null && mCamera.isOpened()) {
List<Size> sizes = mCamera.getSupportedPreviewSizes();
int mFrameWidth = width;
int mFrameHeight = height;
{ // selecting optimal camera preview size
double minDiff = Double.MAX_VALUE;
for (Size size : sizes) {
if (Math.abs(size.height - height) < minDiff) {
mFrameWidth = (int) size.width;
mFrameHeight = (int) size.height;
minDiff = Math.abs(size.height - height);
}
}
}
mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, mFrameWidth);
mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, mFrameHeight);
}
}
}
#. The last step would be to update the *run()* void in *HelloOpenCVView* class as follows: .. code-block:: java
.. code-block:: java :linenos:
public void run() { private VideoCapture mCamera;
while (true) {
Bitmap bmp = null; public boolean cameraOpen() {
synchronized (this) { synchronized (this) {
if (mCamera == null) cameraRelease();
break; mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID);
if (!mCamera.grab()) if (!mCamera.isOpened()) {
break; mCamera.release();
mCamera = null;
bmp = processFrame(mCamera); Log.e("HelloOpenCVView", "Failed to open native camera");
} return false;
if (bmp != null) { }
Canvas canvas = getHolder().lockCanvas(); }
if (canvas != null) { return true;
canvas.drawBitmap(bmp, (canvas.getWidth() - bmp.getWidth()) / 2, }
(canvas.getHeight() - bmp.getHeight()) / 2, null);
getHolder().unlockCanvasAndPost(canvas); public void cameraRelease() {
synchronized(this) {
} if (mCamera != null) {
bmp.recycle(); mCamera.release();
} mCamera = null;
} }
} }
}
protected Bitmap processFrame(VideoCapture capture) {
Mat mRgba = new Mat(); private void cameraSetup(int width, int height) {
capture.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); synchronized (this) {
//process mRgba if (mCamera != null && mCamera.isOpened()) {
Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888); List<Size> sizes = mCamera.getSupportedPreviewSizes();
try { int mFrameWidth = width;
Utils.matToBitmap(mRgba, bmp); int mFrameHeight = height;
} catch(Exception e) { { // selecting optimal camera preview size
Log.e("processFrame", "Utils.matToBitmap() throws an exception: " + e.getMessage()); double minDiff = Double.MAX_VALUE;
bmp.recycle(); for (Size size : sizes) {
bmp = null; if (Math.abs(size.height - height) < minDiff) {
} mFrameWidth = (int) size.width;
return bmp; mFrameHeight = (int) size.height;
} minDiff = Math.abs(size.height - height);
}
}
}
mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, mFrameWidth);
mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, mFrameHeight);
}
}
}
#. The last step would be to update the *run()* void in *HelloOpenCVView* class as follows:
.. code-block:: java
:linenos:
public void run() {
while (true) {
Bitmap bmp = null;
synchronized (this) {
if (mCamera == null)
break;
if (!mCamera.grab())
break;
bmp = processFrame(mCamera);
}
if (bmp != null) {
Canvas canvas = getHolder().lockCanvas();
if (canvas != null) {
canvas.drawBitmap(bmp, (canvas.getWidth() - bmp.getWidth()) / 2,
(canvas.getHeight() - bmp.getHeight()) / 2, null);
getHolder().unlockCanvasAndPost(canvas);
}
bmp.recycle();
}
}
}
protected Bitmap processFrame(VideoCapture capture) {
Mat mRgba = new Mat();
capture.retrieve(mRgba, Highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
//process mRgba
Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);
try {
Utils.matToBitmap(mRgba, bmp);
} catch(Exception e) {
Log.e("processFrame", "Utils.matToBitmap() throws an exception: " + e.getMessage());
bmp.recycle();
bmp = null;
}
return bmp;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment