Commit 0693073b authored by Alexander Smorkalov's avatar Alexander Smorkalov

Example3-native updated for OpenCV Manager model

parent bd500ff0
package org.opencv.samples.tutorial3; package org.opencv.samples.tutorial3;
import org.opencv.android.BaseLoaderCallback;
import org.opencv.android.LoaderCallbackInterface;
import org.opencv.android.OpenCVLoader;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
...@@ -10,6 +14,42 @@ import android.view.Window; ...@@ -10,6 +14,42 @@ import android.view.Window;
public class Sample3Native extends Activity { public class Sample3Native extends Activity {
private static final String TAG = "Sample::Activity"; private static final String TAG = "Sample::Activity";
private Sample3View mView; private Sample3View mView;
private BaseLoaderCallback mOpenCVCallBack = new BaseLoaderCallback(this) {
@Override
public void onManagerConnected(int status) {
switch (status) {
case LoaderCallbackInterface.SUCCESS:
{
Log.i(TAG, "OpenCV loaded successfully");
// Load native library after(!) OpenCV initialization
System.loadLibrary("native_sample");
// Create and set View
mView = new Sample3View(mAppContext);
setContentView(mView);
// Check native OpenCV camera
if( !mView.openCamera() ) {
AlertDialog ad = new AlertDialog.Builder(mAppContext).create();
ad.setCancelable(false); // This blocks the 'BACK' button
ad.setMessage("Fatal error: can't open camera!");
ad.setButton("OK", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
finish();
}
});
ad.show();
}
} break;
default:
{
super.onManagerConnected(status);
} break;
}
}
};
public Sample3Native() { public Sample3Native() {
Log.i(TAG, "Instantiated new " + this.getClass()); Log.i(TAG, "Instantiated new " + this.getClass());
...@@ -19,14 +59,15 @@ public class Sample3Native extends Activity { ...@@ -19,14 +59,15 @@ public class Sample3Native extends Activity {
protected void onPause() { protected void onPause() {
Log.i(TAG, "onPause"); Log.i(TAG, "onPause");
super.onPause(); super.onPause();
mView.releaseCamera(); if (null != mView)
mView.releaseCamera();
} }
@Override @Override
protected void onResume() { protected void onResume() {
Log.i(TAG, "onResume"); Log.i(TAG, "onResume");
super.onResume(); super.onResume();
if( !mView.openCamera() ) { if((null != mView) && !mView.openCamera() ) {
AlertDialog ad = new AlertDialog.Builder(this).create(); AlertDialog ad = new AlertDialog.Builder(this).create();
ad.setCancelable(false); // This blocks the 'BACK' button ad.setCancelable(false); // This blocks the 'BACK' button
ad.setMessage("Fatal error: can't open camera!"); ad.setMessage("Fatal error: can't open camera!");
...@@ -46,7 +87,11 @@ public class Sample3Native extends Activity { ...@@ -46,7 +87,11 @@ public class Sample3Native extends Activity {
Log.i(TAG, "onCreate"); Log.i(TAG, "onCreate");
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE); requestWindowFeature(Window.FEATURE_NO_TITLE);
mView = new Sample3View(this);
setContentView(mView); if (!OpenCVLoader.initAsync(OpenCVLoader.OPEN_CV_VERSION_2_4_0, this, mOpenCVCallBack))
{
Log.e(TAG, "Cannot connect to OpenCV Manager");
finish();
}
} }
} }
...@@ -26,9 +26,7 @@ class Sample3View extends SampleViewBase { ...@@ -26,9 +26,7 @@ class Sample3View extends SampleViewBase {
mBitmap.recycle(); mBitmap.recycle();
mBitmap = null; mBitmap = null;
} }
mRGBA = null; mRGBA = null;
} }
@Override @Override
...@@ -43,8 +41,4 @@ class Sample3View extends SampleViewBase { ...@@ -43,8 +41,4 @@ class Sample3View extends SampleViewBase {
} }
public native void FindFeatures(int width, int height, byte yuv[], int[] rgba); public native void FindFeatures(int width, int height, byte yuv[], int[] rgba);
static {
System.loadLibrary("native_sample");
}
} }
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