WallyHackenslacker/NxtAR-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Changed OpenCV to load statically.

Browse Source
This commit is contained in:
Wally Hackenslacker
2014-04-05 15:03:53 -04:30
parent 00038f1622
commit 5c92d603d2
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jni/Android.mk
View File

@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
OPENCV_CAMERA_MODULES:=off OPENCV_CAMERA_MODULES:=off
OPENCV_LIB_TYPE:=STATIC OPENCV_LIB_TYPE:=STATIC
include C:\Users\miguel.astor\Documents\OpenCV-2.4.8-android-sdk\sdk\native\jni\OpenCV.mk include /home/miky/Escritorio/OpenCV-2.4.7-android-sdk/sdk/native/jni/OpenCV.mk
LOCAL_MODULE := cvproc LOCAL_MODULE := cvproc
LOCAL_SRC_FILES := cv_proc.cpp marker.cpp LOCAL_SRC_FILES := cv_proc.cpp marker.cpp

5
jni/cv_proc.cpp
View File

@@ -23,15 +23,10 @@
extern "C"{ extern "C"{
#ifdef CAN_LOG #ifdef CAN_LOG
#define log(TAG, MSG) (__android_log_write(ANDROID_LOG_DEBUG, TAG, MSG)) #define log(TAG, MSG) (__android_log_write(ANDROID_LOG_DEBUG, TAG, MSG))
const char * TAG = "CVPROC_NATIVE"; const char * TAG = "CVPROC_NATIVE";
#else #else
#define log(TAG, MSG) (1 + 1) #define log(TAG, MSG) (1 + 1)
#endif #endif
JNIEXPORT void JNICALL Java_ve_ucv_ciens_ccg_nxtar_MainActivity_getMarkerCodesAndLocations( JNIEXPORT void JNICALL Java_ve_ucv_ciens_ccg_nxtar_MainActivity_getMarkerCodesAndLocations(

2
project.properties
View File

@@ -9,4 +9,4 @@
# Project target. # Project target.
target=android-19 target=android-19
android.library.reference.1=../../../../../Documents/OpenCV-2.4.8-android-sdk/sdk/java android.library.reference.1=../../../../../Escritorio/OpenCV-2.4.7-android-sdk/sdk/java

18
src/ve/ucv/ciens/ccg/nxtar/MainActivity.java
View File

@@ -51,16 +51,21 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
private MulticastLock multicastLock; private MulticastLock multicastLock;
private Handler uiHandler; private Handler uiHandler;
private Context uiContext; private Context uiContext;
private boolean ocvOn; private static boolean ocvOn = false;
private BaseLoaderCallback loaderCallback; private BaseLoaderCallback loaderCallback;
private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
/*static{ static{
if (!OpenCVLoader.initDebug()){ if(!OpenCVLoader.initDebug()){
Gdx.app.exit(); Gdx.app.exit();
} }
try{
System.loadLibrary("cvproc"); System.loadLibrary("cvproc");
}*/ ocvOn = true;
}catch(UnsatisfiedLinkError u){
Gdx.app.exit();
}
}
public native void getMarkerCodesAndLocations(long inMat, long outMat, int[] codes); public native void getMarkerCodesAndLocations(long inMat, long outMat, int[] codes);
@@ -68,7 +73,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
public void onCreate(Bundle savedInstanceState){ public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
ocvOn = false; //ocvOn = false;
if(!Ouya.runningOnOuya){ if(!Ouya.runningOnOuya){
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -93,6 +98,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
case LoaderCallbackInterface.SUCCESS: case LoaderCallbackInterface.SUCCESS:
System.loadLibrary("cvproc"); System.loadLibrary("cvproc");
ocvOn = true; ocvOn = true;
Toast.makeText(uiContext, R.string.ocv_success, Toast.LENGTH_LONG).show();
break; break;
default: default:
Toast.makeText(uiContext, R.string.ocv_failed, Toast.LENGTH_LONG).show(); Toast.makeText(uiContext, R.string.ocv_failed, Toast.LENGTH_LONG).show();
@@ -102,7 +108,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
} }
}; };
OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_7, this, loaderCallback); //OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_7, this, loaderCallback);
initialize(new NxtARCore(this), cfg); initialize(new NxtARCore(this), cfg);
} }