From b3eee49451142b82bef43daba0f255e276086aa5 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 23 Dec 2013 15:20:09 +0400 Subject: [PATCH] New sample for CUDA on Android added. --- samples/android/CMakeLists.txt | 4 + samples/android/tutorial-4-cuda/.classpath | 8 + samples/android/tutorial-4-cuda/.cproject | 76 ++++++++++ samples/android/tutorial-4-cuda/.project | 101 +++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 4 + .../android/tutorial-4-cuda/AndroidManifest.xml | 38 +++++ samples/android/tutorial-4-cuda/CMakeLists.txt | 16 ++ samples/android/tutorial-4-cuda/jni/Android.mk | 13 ++ samples/android/tutorial-4-cuda/jni/Application.mk | 4 + samples/android/tutorial-4-cuda/jni/jni_part.cpp | 35 +++++ .../android/tutorial-4-cuda/res/drawable/icon.png | Bin 0 -> 1997 bytes .../res/layout/tutorial4_surface_view.xml | 11 ++ .../android/tutorial-4-cuda/res/values/strings.xml | 4 + .../samples/tutorial4/Tutorial4Activity.java | 166 +++++++++++++++++++++ 14 files changed, 480 insertions(+) create mode 100644 samples/android/tutorial-4-cuda/.classpath create mode 100644 samples/android/tutorial-4-cuda/.cproject create mode 100644 samples/android/tutorial-4-cuda/.project create mode 100644 samples/android/tutorial-4-cuda/.settings/org.eclipse.jdt.core.prefs create mode 100644 samples/android/tutorial-4-cuda/AndroidManifest.xml create mode 100644 samples/android/tutorial-4-cuda/CMakeLists.txt create mode 100644 samples/android/tutorial-4-cuda/jni/Android.mk create mode 100644 samples/android/tutorial-4-cuda/jni/Application.mk create mode 100644 samples/android/tutorial-4-cuda/jni/jni_part.cpp create mode 100644 samples/android/tutorial-4-cuda/res/drawable/icon.png create mode 100644 samples/android/tutorial-4-cuda/res/layout/tutorial4_surface_view.xml create mode 100644 samples/android/tutorial-4-cuda/res/values/strings.xml create mode 100644 samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index 0dc4a3c..d938580 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -15,6 +15,10 @@ add_subdirectory(tutorial-1-camerapreview) add_subdirectory(tutorial-2-mixedprocessing) add_subdirectory(tutorial-3-cameracontrol) +if (HAVE_opencv_gpu) + add_subdirectory(tutorial-4-cuda) +endif() + add_subdirectory(native-activity) # hello-android sample diff --git a/samples/android/tutorial-4-cuda/.classpath b/samples/android/tutorial-4-cuda/.classpath new file mode 100644 index 0000000..3f9691c --- /dev/null +++ b/samples/android/tutorial-4-cuda/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/samples/android/tutorial-4-cuda/.cproject b/samples/android/tutorial-4-cuda/.cproject new file mode 100644 index 0000000..80a5051 --- /dev/null +++ b/samples/android/tutorial-4-cuda/.cproject @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/android/tutorial-4-cuda/.project b/samples/android/tutorial-4-cuda/.project new file mode 100644 index 0000000..6366dfb --- /dev/null +++ b/samples/android/tutorial-4-cuda/.project @@ -0,0 +1,101 @@ + + + OpenCV Tutorial 4 - CUDA + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + auto,full,incremental, + + + ?name? + + + + org.eclipse.cdt.make.core.append_environment + true + + + org.eclipse.cdt.make.core.autoBuildTarget + + + + org.eclipse.cdt.make.core.buildArguments + + + + org.eclipse.cdt.make.core.buildCommand + ${NDKROOT}/ndk-build.cmd + + + org.eclipse.cdt.make.core.cleanBuildTarget + clean + + + org.eclipse.cdt.make.core.contents + org.eclipse.cdt.make.core.activeConfigSettings + + + org.eclipse.cdt.make.core.enableAutoBuild + true + + + org.eclipse.cdt.make.core.enableCleanBuild + false + + + org.eclipse.cdt.make.core.enableFullBuild + true + + + org.eclipse.cdt.make.core.fullBuildTarget + + + + org.eclipse.cdt.make.core.stopOnError + true + + + org.eclipse.cdt.make.core.useDefaultBuildCmd + false + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/samples/android/tutorial-4-cuda/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-4-cuda/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..b080d2d --- /dev/null +++ b/samples/android/tutorial-4-cuda/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/samples/android/tutorial-4-cuda/AndroidManifest.xml b/samples/android/tutorial-4-cuda/AndroidManifest.xml new file mode 100644 index 0000000..7c8bb0d --- /dev/null +++ b/samples/android/tutorial-4-cuda/AndroidManifest.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/android/tutorial-4-cuda/CMakeLists.txt b/samples/android/tutorial-4-cuda/CMakeLists.txt new file mode 100644 index 0000000..a011b33 --- /dev/null +++ b/samples/android/tutorial-4-cuda/CMakeLists.txt @@ -0,0 +1,16 @@ +set(sample example-tutorial-4-cuda) + +ocv_check_dependencies(opencv_core opencv_java opencv_gpu) + +if (OCV_DEPENDENCIES_FOUND) + if(BUILD_FAT_JAVA_LIB) + set(native_deps opencv_java opencv_gpu) + else() + set(native_deps opencv_gpu) + endif() + + add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET} NATIVE_DEPS ${native_deps}) + if(TARGET ${sample}) + add_dependencies(opencv_android_examples ${sample}) + endif() +endif() diff --git a/samples/android/tutorial-4-cuda/jni/Android.mk b/samples/android/tutorial-4-cuda/jni/Android.mk new file mode 100644 index 0000000..3d709df --- /dev/null +++ b/samples/android/tutorial-4-cuda/jni/Android.mk @@ -0,0 +1,13 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +CUDA_TOOLKIT_DIR=$(CUDA_TOOLKIT_ROOT) +include ../../sdk/native/jni/OpenCV.mk + +LOCAL_MODULE := cuda_sample +LOCAL_SRC_FILES := jni_part.cpp +LOCAL_LDLIBS += -llog -ldl +LOCAL_LDFLAGS += -Os + +include $(BUILD_SHARED_LIBRARY) diff --git a/samples/android/tutorial-4-cuda/jni/Application.mk b/samples/android/tutorial-4-cuda/jni/Application.mk new file mode 100644 index 0000000..4fffcb2 --- /dev/null +++ b/samples/android/tutorial-4-cuda/jni/Application.mk @@ -0,0 +1,4 @@ +APP_STL := gnustl_static +APP_CPPFLAGS := -frtti -fexceptions +APP_ABI := armeabi-v7a +APP_PLATFORM := android-8 diff --git a/samples/android/tutorial-4-cuda/jni/jni_part.cpp b/samples/android/tutorial-4-cuda/jni/jni_part.cpp new file mode 100644 index 0000000..fdb47de --- /dev/null +++ b/samples/android/tutorial-4-cuda/jni/jni_part.cpp @@ -0,0 +1,35 @@ +#include +#include +#include +#include +#include +#include + +using namespace std; +using namespace cv; +using namespace cv::gpu; + +#include + +#define LOG_TAG "Cuda" +#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)) + +extern "C" { +JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Tutorial4Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); + +JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Tutorial4Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) +{ + Mat& mGr = *(Mat*)addrGray; + Mat& mRgb = *(Mat*)addrRgba; + vector keypoints; + GpuMat grGpu(mGr); + + FAST_GPU fast(50); + fast(grGpu, GpuMat(), keypoints); + for( unsigned int i = 0; i < keypoints.size(); i++ ) + { + const KeyPoint& kp = keypoints[i]; + circle(mRgb, Point(kp.pt.x, kp.pt.y), 10, Scalar(255,0,0,255)); + } +} +} diff --git a/samples/android/tutorial-4-cuda/res/drawable/icon.png b/samples/android/tutorial-4-cuda/res/drawable/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..630454927b592eb585c21527c430fc739c7970a6 GIT binary patch literal 1997 zcmV;;2Qv7HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2iyk& z2s4Z(uWcvB1k+?B|HcZ5+p(*;Q^&-8AtzSnVCK7?)^Xiwf0*7z0ZN;t#z9i`sgtpqdV3hDNF*c2bKc!qcQaX zUny)Tz}^_l!dPca%!U9i64N>!i~1_h=?F58~*Mqs?aUag-wNp3eJ zaArHlobMV1PMO^yg*noOAUz|E0i{}8`nIiHOW|~F4mjoR_GH_vZVKN?bHNdXe;To> zxdyn_TnD>62p5lGlR~e9qrf7C+ui6sX@;J1@Mx>Yo=qMBRs~*)bDAoXUZYSHTab?f z_PACCXF@bcF}lW`X>mi~9D%@SGZ2{F%CTpbhLf>?v)%*vE3D~)z{*wz=t^t3pfEGA zffL(4AU5DX%yUkKoB_Jb(8oFW!NI-`j{z#&Z&^_sT-34vIXFYp`=GEPgYAu)4n9D4 z%K`*+8v7m2z|O!Kz|Xto?PB|!;VL`0G=ur`jDlQ$D=+i6dSt)j#Si?i#3rh3ZDkkx z+9TWVDcFEP;8fsZmts4LZyQ^=NS&&oMq^DBPd9*r!p~~YrdwMdQuxcK)CgcvlC7iQ z6m}XDL=_ke!d;S<2IvOy5aI>4B-sk!6i-qAqn6i#qR%}BH;aqaE~#zv6|u2ViZHn? z1hW8E8rkz`nyn$2WU0dhK4^p<)W{{jH|2^S^#FZ&jV&V)7;HC58VOgls*{S?bCuB! zgJG~P)&TrE+Oa9jPq^~G`MQI^ISDar1?}7f7D?&qi-Zc{Oivqep0%xlm22B7?$lt? zRDoZ$&ZSsjO2nE0ft%CR$aVrKp5WRX7^zue>Cw3+QGx=M@MFBYs{CEWmLZ zN*9hpz)s*B96QRjjj`Qi_;Vb>Z73h0DK9}$-axr}l%1BFSp9)x9Ky;`(^n%*$`F!V zkY*oPaAK+6&unXUeSit`5c;F3iU&9)kOVILi%-C3#za9jc>jUr;Wvs~#jZ#FaZ!2fi34Sb1N@BsFCj&@J zs;eb(o@Ffe=D?d6qPKGdXKQjn9~5j94Pu>ge`)`61V~3frX{l7>dTEi%6<8;N9K*(u}%^bWomltk*Vp@k|^lo)yA?qH}(jBlCHBo51XA|gNf(* zoeh<>k{r9Y4)pw$!k7FX&+PyB(?mq~(*^;K7{UQF&X#s!ILS zHX&7zhmyZ|_z=x$C7sRWW=r7+&daHU&gPWWQt)uC*X>tEFZ6J;H6WaAcCCQRo2VjP z>v8^kmJJ*U_eqdHY-p9+xixW&Umgf^mpLS>_nMj zvaJlD2pv8o7#@|SuT=D$XZ)5=GJyZFvEPhNoO#NE^Nc>q2{?8F#Z+({^MQk9zw9zH z=)VjA4HzfT(Fq(eDSwVGl!7_^3!$70OgHG7MYIxpx7Q{~Cgnag|7WoceAizs@IKwlGBBq*Ioi0qby4ylKkgqvR5BcLR&Vy39?8 + + + + diff --git a/samples/android/tutorial-4-cuda/res/values/strings.xml b/samples/android/tutorial-4-cuda/res/values/strings.xml new file mode 100644 index 0000000..ff20b92 --- /dev/null +++ b/samples/android/tutorial-4-cuda/res/values/strings.xml @@ -0,0 +1,4 @@ + + + OCV T4 CUDA + diff --git a/samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java b/samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java new file mode 100644 index 0000000..2f6a48a --- /dev/null +++ b/samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java @@ -0,0 +1,166 @@ +package org.opencv.samples.tutorial4; + +import org.opencv.android.BaseLoaderCallback; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewFrame; +import org.opencv.android.LoaderCallbackInterface; +import org.opencv.android.OpenCVLoader; +import org.opencv.core.CvType; +import org.opencv.core.Mat; +import org.opencv.android.CameraBridgeViewBase; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener2; +import org.opencv.imgproc.Imgproc; + +import android.app.Activity; +import android.os.Bundle; +import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; +import android.view.WindowManager; + +public class Tutorial4Activity extends Activity implements CvCameraViewListener2 { + private static final String TAG = "OCVSample::Activity"; + + private static final int VIEW_MODE_RGBA = 0; + private static final int VIEW_MODE_GRAY = 1; + private static final int VIEW_MODE_CANNY = 2; + private static final int VIEW_MODE_FEATURES = 5; + + private int mViewMode; + private Mat mRgba; + private Mat mIntermediateMat; + private Mat mGray; + + private MenuItem mItemPreviewRGBA; + private MenuItem mItemPreviewGray; + private MenuItem mItemPreviewCanny; + private MenuItem mItemPreviewFeatures; + + private CameraBridgeViewBase mOpenCvCameraView; + + private BaseLoaderCallback mLoaderCallback = 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("cuda_sample"); + + mOpenCvCameraView.enableView(); + } break; + default: + { + super.onManagerConnected(status); + } break; + } + } + }; + + public Tutorial4Activity() { + Log.i(TAG, "Instantiated new " + this.getClass()); + } + + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + Log.i(TAG, "called onCreate"); + super.onCreate(savedInstanceState); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + + setContentView(R.layout.tutorial4_surface_view); + + mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial4_activity_surface_view); + mOpenCvCameraView.setCvCameraViewListener(this); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + Log.i(TAG, "called onCreateOptionsMenu"); + mItemPreviewRGBA = menu.add("Preview RGBA"); + mItemPreviewGray = menu.add("Preview GRAY"); + mItemPreviewCanny = menu.add("Canny"); + mItemPreviewFeatures = menu.add("Find features"); + return true; + } + + @Override + public void onPause() + { + super.onPause(); + if (mOpenCvCameraView != null) + mOpenCvCameraView.disableView(); + } + + @Override + public void onResume() + { + super.onResume(); + OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_8, this, mLoaderCallback); + } + + public void onDestroy() { + super.onDestroy(); + if (mOpenCvCameraView != null) + mOpenCvCameraView.disableView(); + } + + public void onCameraViewStarted(int width, int height) { + mRgba = new Mat(height, width, CvType.CV_8UC4); + mIntermediateMat = new Mat(height, width, CvType.CV_8UC4); + mGray = new Mat(height, width, CvType.CV_8UC1); + } + + public void onCameraViewStopped() { + mRgba.release(); + mGray.release(); + mIntermediateMat.release(); + } + + public Mat onCameraFrame(CvCameraViewFrame inputFrame) { + final int viewMode = mViewMode; + switch (viewMode) { + case VIEW_MODE_GRAY: + // input frame has gray scale format + Imgproc.cvtColor(inputFrame.gray(), mRgba, Imgproc.COLOR_GRAY2RGBA, 4); + break; + case VIEW_MODE_RGBA: + // input frame has RBGA format + mRgba = inputFrame.rgba(); + break; + case VIEW_MODE_CANNY: + // input frame has gray scale format + mRgba = inputFrame.rgba(); + Imgproc.Canny(inputFrame.gray(), mIntermediateMat, 80, 100); + Imgproc.cvtColor(mIntermediateMat, mRgba, Imgproc.COLOR_GRAY2RGBA, 4); + break; + case VIEW_MODE_FEATURES: + // input frame has RGBA format + mRgba = inputFrame.rgba(); + mGray = inputFrame.gray(); + FindFeatures(mGray.getNativeObjAddr(), mRgba.getNativeObjAddr()); + break; + } + + return mRgba; + } + + public boolean onOptionsItemSelected(MenuItem item) { + Log.i(TAG, "called onOptionsItemSelected; selected item: " + item); + + if (item == mItemPreviewRGBA) { + mViewMode = VIEW_MODE_RGBA; + } else if (item == mItemPreviewGray) { + mViewMode = VIEW_MODE_GRAY; + } else if (item == mItemPreviewCanny) { + mViewMode = VIEW_MODE_CANNY; + } else if (item == mItemPreviewFeatures) { + mViewMode = VIEW_MODE_FEATURES; + } + + return true; + } + + public native void FindFeatures(long matAddrGr, long matAddrRgba); +} -- 2.7.4