diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index b1cb62833..a0794cb97 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -11,11 +11,9 @@ add_subdirectory(face-detection) add_subdirectory(image-manipulations) add_subdirectory(color-blob-detection) -add_subdirectory(tutorial-1-addopencv) -add_subdirectory(tutorial-2-opencvcamera) -add_subdirectory(tutorial-3-native) -add_subdirectory(tutorial-4-mixed) -add_subdirectory(tutorial-5-cameracontrol) +add_subdirectory(tutorial-1-camerapreview) +add_subdirectory(tutorial-2-mixedprocessing) +add_subdirectory(tutorial-3-cameracontrol) #hello-android sample if(HAVE_opencv_highgui) diff --git a/samples/android/tutorial-1-addopencv/CMakeLists.txt b/samples/android/tutorial-1-addopencv/CMakeLists.txt deleted file mode 100644 index eb5bc7982..000000000 --- a/samples/android/tutorial-1-addopencv/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(sample example-tutorial-1-addopencv) - -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/tutorial-1-addopencv/.classpath b/samples/android/tutorial-1-camerapreview/.classpath similarity index 100% rename from samples/android/tutorial-1-addopencv/.classpath rename to samples/android/tutorial-1-camerapreview/.classpath diff --git a/samples/android/tutorial-1-addopencv/.project b/samples/android/tutorial-1-camerapreview/.project similarity index 94% rename from samples/android/tutorial-1-addopencv/.project rename to samples/android/tutorial-1-camerapreview/.project index 5ef434a67..bcb4d1718 100644 --- a/samples/android/tutorial-1-addopencv/.project +++ b/samples/android/tutorial-1-camerapreview/.project @@ -1,6 +1,6 @@ - OpenCV Tutorial 1 - Add OpenCV + OpenCV Tutorial 1 - Camera Preview diff --git a/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-1-camerapreview/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-1-camerapreview/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/tutorial-1-addopencv/AndroidManifest.xml b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml similarity index 96% rename from samples/android/tutorial-1-addopencv/AndroidManifest.xml rename to samples/android/tutorial-1-camerapreview/AndroidManifest.xml index 9b4e797da..47d45ed37 100644 --- a/samples/android/tutorial-1-addopencv/AndroidManifest.xml +++ b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-2-opencvcamera/CMakeLists.txt b/samples/android/tutorial-1-camerapreview/CMakeLists.txt similarity index 82% rename from samples/android/tutorial-2-opencvcamera/CMakeLists.txt rename to samples/android/tutorial-1-camerapreview/CMakeLists.txt index 685f870b6..77ed5bce8 100644 --- a/samples/android/tutorial-2-opencvcamera/CMakeLists.txt +++ b/samples/android/tutorial-1-camerapreview/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-2-opencvcamera) +set(sample example-tutorial-1-camerapreview) add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET}) if(TARGET ${sample}) diff --git a/samples/android/tutorial-1-addopencv/res/drawable/icon.png b/samples/android/tutorial-1-camerapreview/res/drawable/icon.png similarity index 100% rename from samples/android/tutorial-1-addopencv/res/drawable/icon.png rename to samples/android/tutorial-1-camerapreview/res/drawable/icon.png diff --git a/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml b/samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml similarity index 100% rename from samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml rename to samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml diff --git a/samples/android/tutorial-1-addopencv/res/values/strings.xml b/samples/android/tutorial-1-camerapreview/res/values/strings.xml similarity index 53% rename from samples/android/tutorial-1-addopencv/res/values/strings.xml rename to samples/android/tutorial-1-camerapreview/res/values/strings.xml index c5e899883..b7bea7d51 100644 --- a/samples/android/tutorial-1-addopencv/res/values/strings.xml +++ b/samples/android/tutorial-1-camerapreview/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T1 Add OpenCV + OCV T1 Preview diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java similarity index 95% rename from samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java rename to samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java index 1fbac34fe..cbac1649b 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java +++ b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java @@ -17,7 +17,7 @@ import android.view.SurfaceView; import android.view.WindowManager; import android.widget.Toast; -public class Sample1Java extends Activity implements CvCameraViewListener2 { +public class Tutorial1Activity extends Activity implements CvCameraViewListener2 { private static final String TAG = "OCVSample::Activity"; private CameraBridgeViewBase mOpenCvCameraView; @@ -41,7 +41,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 { } }; - public Sample1Java() { + public Tutorial1Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } @@ -88,7 +88,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 { @Override public boolean onCreateOptionsMenu(Menu menu) { Log.i(TAG, "called onCreateOptionsMenu"); - mItemSwitchCamera = menu.add("Switch camera"); + mItemSwitchCamera = menu.add("Toggle Native/Java camera"); return true; } diff --git a/samples/android/tutorial-2-opencvcamera/.classpath b/samples/android/tutorial-2-mixedprocessing/.classpath similarity index 100% rename from samples/android/tutorial-2-opencvcamera/.classpath rename to samples/android/tutorial-2-mixedprocessing/.classpath diff --git a/samples/android/tutorial-4-mixed/.cproject b/samples/android/tutorial-2-mixedprocessing/.cproject similarity index 97% rename from samples/android/tutorial-4-mixed/.cproject rename to samples/android/tutorial-2-mixedprocessing/.cproject index 57bf7e5a3..0d1d13e85 100644 --- a/samples/android/tutorial-4-mixed/.cproject +++ b/samples/android/tutorial-2-mixedprocessing/.cproject @@ -60,7 +60,7 @@ - + @@ -69,6 +69,6 @@ - + diff --git a/samples/android/tutorial-3-native/.project b/samples/android/tutorial-2-mixedprocessing/.project similarity index 98% rename from samples/android/tutorial-3-native/.project rename to samples/android/tutorial-2-mixedprocessing/.project index 2c27e6567..c3e05a59a 100644 --- a/samples/android/tutorial-3-native/.project +++ b/samples/android/tutorial-2-mixedprocessing/.project @@ -1,6 +1,6 @@ - OpenCV Tutorial 3 - Add Native OpenCV + OpenCV Tutorial 2 - Mixed Processing diff --git a/samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-2-mixedprocessing/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-2-mixedprocessing/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml similarity index 96% rename from samples/android/tutorial-2-opencvcamera/AndroidManifest.xml rename to samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml index 3378b40e6..795dd204b 100644 --- a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml +++ b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-3-native/CMakeLists.txt b/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt similarity index 88% rename from samples/android/tutorial-3-native/CMakeLists.txt rename to samples/android/tutorial-2-mixedprocessing/CMakeLists.txt index c3c1970a9..e8771ede1 100644 --- a/samples/android/tutorial-3-native/CMakeLists.txt +++ b/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-3-native) +set(sample example-tutorial-2-mixedprocessing) if(BUILD_FAT_JAVA_LIB) set(native_deps opencv_java) diff --git a/samples/android/tutorial-4-mixed/jni/Android.mk b/samples/android/tutorial-2-mixedprocessing/jni/Android.mk similarity index 100% rename from samples/android/tutorial-4-mixed/jni/Android.mk rename to samples/android/tutorial-2-mixedprocessing/jni/Android.mk diff --git a/samples/android/tutorial-3-native/jni/Application.mk b/samples/android/tutorial-2-mixedprocessing/jni/Application.mk similarity index 100% rename from samples/android/tutorial-3-native/jni/Application.mk rename to samples/android/tutorial-2-mixedprocessing/jni/Application.mk diff --git a/samples/android/tutorial-4-mixed/jni/jni_part.cpp b/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp similarity index 66% rename from samples/android/tutorial-4-mixed/jni/jni_part.cpp rename to samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp index 957eda12f..e7ed75d21 100644 --- a/samples/android/tutorial-4-mixed/jni/jni_part.cpp +++ b/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp @@ -8,9 +8,9 @@ using namespace std; using namespace cv; extern "C" { -JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Sample4Mixed_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); +JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tuturial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); -JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial4_Sample4Mixed_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) +JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) { Mat& mGr = *(Mat*)addrGray; Mat& mRgb = *(Mat*)addrRgba; diff --git a/samples/android/tutorial-2-opencvcamera/res/drawable/icon.png b/samples/android/tutorial-2-mixedprocessing/res/drawable/icon.png similarity index 100% rename from samples/android/tutorial-2-opencvcamera/res/drawable/icon.png rename to samples/android/tutorial-2-mixedprocessing/res/drawable/icon.png diff --git a/samples/android/tutorial-2-opencvcamera/res/layout/tutorial2_surface_view.xml b/samples/android/tutorial-2-mixedprocessing/res/layout/tutorial2_surface_view.xml similarity index 90% rename from samples/android/tutorial-2-opencvcamera/res/layout/tutorial2_surface_view.xml rename to samples/android/tutorial-2-mixedprocessing/res/layout/tutorial2_surface_view.xml index b8f760494..a176669aa 100644 --- a/samples/android/tutorial-2-opencvcamera/res/layout/tutorial2_surface_view.xml +++ b/samples/android/tutorial-2-mixedprocessing/res/layout/tutorial2_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - diff --git a/samples/android/tutorial-2-opencvcamera/res/values/strings.xml b/samples/android/tutorial-2-mixedprocessing/res/values/strings.xml similarity index 50% rename from samples/android/tutorial-2-opencvcamera/res/values/strings.xml rename to samples/android/tutorial-2-mixedprocessing/res/values/strings.xml index c5405b9cb..0ecc4bb60 100644 --- a/samples/android/tutorial-2-opencvcamera/res/values/strings.xml +++ b/samples/android/tutorial-2-mixedprocessing/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T2 Use OpenCV Camera + OCV T2 Mixed Processing diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java similarity index 95% rename from samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java rename to samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java index 97a563be4..eb84a1ec6 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java +++ b/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java @@ -1,4 +1,4 @@ -package org.opencv.samples.tutorial4; +package org.opencv.samples.tutorial2; import org.opencv.android.BaseLoaderCallback; import org.opencv.android.CameraBridgeViewBase.CvCameraViewFrame; @@ -17,7 +17,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.WindowManager; -public class Sample4Mixed extends Activity implements CvCameraViewListener2 { +public class Tutorial2Activity extends Activity implements CvCameraViewListener2 { private static final String TAG = "OCVSample::Activity"; private static final int VIEW_MODE_RGBA = 0; @@ -58,7 +58,7 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener2 { } }; - public Sample4Mixed() { + public Tutorial2Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } @@ -69,9 +69,9 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener2 { super.onCreate(savedInstanceState); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - setContentView(R.layout.tutorial4_surface_view); + setContentView(R.layout.tutorial2_surface_view); - mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial4_activity_surface_view); + mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial2_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); } diff --git a/samples/android/tutorial-2-opencvcamera/.project b/samples/android/tutorial-2-opencvcamera/.project deleted file mode 100644 index 1d6c7f62c..000000000 --- a/samples/android/tutorial-2-opencvcamera/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - OpenCV Tutorial 2 - Use OpenCV Camera - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java deleted file mode 100644 index 3a19ffd5e..000000000 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.opencv.samples.tutorial2; - -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.Core; -import org.opencv.core.CvType; -import org.opencv.core.Mat; -import org.opencv.core.Point; -import org.opencv.core.Scalar; -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 Sample2NativeCamera extends Activity implements CvCameraViewListener2 { - private static final String TAG = "OCVSample::Activity"; - - public static final int VIEW_MODE_RGBA = 0; - public static final int VIEW_MODE_GRAY = 1; - public static final int VIEW_MODE_CANNY = 2; - - private static int viewMode = VIEW_MODE_RGBA; - private MenuItem mItemPreviewRGBA; - private MenuItem mItemPreviewGray; - private MenuItem mItemPreviewCanny; - private Mat mRgba; - private Mat mIntermediateMat; - - 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"); - mOpenCvCameraView.enableView(); - } break; - default: - { - super.onManagerConnected(status); - } break; - } - } - }; - - public Sample2NativeCamera() { - 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.tutorial2_surface_view); - - mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial2_activity_surface_view); - mOpenCvCameraView.setCvCameraViewListener(this); - } - - @Override - public void onPause() - { - super.onPause(); - if (mOpenCvCameraView != null) - mOpenCvCameraView.disableView(); - } - - @Override - public void onResume() - { - super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, 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); - } - - public void onCameraViewStopped() { - mRgba.release(); - mIntermediateMat.release(); - } - - public Mat onCameraFrame(CvCameraViewFrame inputFrame) { - switch (Sample2NativeCamera.viewMode) { - case Sample2NativeCamera.VIEW_MODE_GRAY: - { - Imgproc.cvtColor(inputFrame.gray(), mRgba, Imgproc.COLOR_GRAY2RGBA, 4); - } break; - case Sample2NativeCamera.VIEW_MODE_RGBA: - { - mRgba = inputFrame.rgba(); - Core.putText(mRgba, "OpenCV+Android", new Point(10, mRgba.rows() - 10), 3, 1, new Scalar(255, 0, 0, 255), 2); - } break; - case Sample2NativeCamera.VIEW_MODE_CANNY: - { - Imgproc.Canny(inputFrame.gray(), mIntermediateMat, 80, 100); - Imgproc.cvtColor(mIntermediateMat, mRgba, Imgproc.COLOR_GRAY2BGRA, 4); - } break; - } - - return mRgba; - } - - @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"); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - Log.i(TAG, "called onOptionsItemSelected; selected item: " + item); - if (item == mItemPreviewRGBA) - { - viewMode = VIEW_MODE_RGBA; - } - else if (item == mItemPreviewGray) - { - viewMode = VIEW_MODE_GRAY; - } - else if (item == mItemPreviewCanny) - { - viewMode = VIEW_MODE_CANNY; - } - - return true; - } -} diff --git a/samples/android/tutorial-4-mixed/.classpath b/samples/android/tutorial-3-cameracontrol/.classpath similarity index 100% rename from samples/android/tutorial-4-mixed/.classpath rename to samples/android/tutorial-3-cameracontrol/.classpath diff --git a/samples/android/tutorial-5-cameracontrol/.project b/samples/android/tutorial-3-cameracontrol/.project similarity index 94% rename from samples/android/tutorial-5-cameracontrol/.project rename to samples/android/tutorial-3-cameracontrol/.project index 40a2d7ff2..bccca2d7c 100644 --- a/samples/android/tutorial-5-cameracontrol/.project +++ b/samples/android/tutorial-3-cameracontrol/.project @@ -1,6 +1,6 @@ - OpenCV Tutorial 5 - Camera Control + OpenCV Tutorial 3 - Camera Control diff --git a/samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-3-cameracontrol/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-3-cameracontrol/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/tutorial-5-cameracontrol/AndroidManifest.xml b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml similarity index 93% rename from samples/android/tutorial-5-cameracontrol/AndroidManifest.xml rename to samples/android/tutorial-3-cameracontrol/AndroidManifest.xml index 053033d6c..da90f95d8 100644 --- a/samples/android/tutorial-5-cameracontrol/AndroidManifest.xml +++ b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-5-cameracontrol/CMakeLists.txt b/samples/android/tutorial-3-cameracontrol/CMakeLists.txt similarity index 82% rename from samples/android/tutorial-5-cameracontrol/CMakeLists.txt rename to samples/android/tutorial-3-cameracontrol/CMakeLists.txt index 986f75402..45c0af2c3 100644 --- a/samples/android/tutorial-5-cameracontrol/CMakeLists.txt +++ b/samples/android/tutorial-3-cameracontrol/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-5-cameracontrol) +set(sample example-tutorial-3-cameracontrol) add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET}) if(TARGET ${sample}) diff --git a/samples/android/tutorial-3-native/res/drawable/icon.png b/samples/android/tutorial-3-cameracontrol/res/drawable/icon.png similarity index 100% rename from samples/android/tutorial-3-native/res/drawable/icon.png rename to samples/android/tutorial-3-cameracontrol/res/drawable/icon.png diff --git a/samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml similarity index 74% rename from samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml rename to samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml index 36376e56b..79fef4eae 100644 --- a/samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml +++ b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml @@ -3,10 +3,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - + android:id="@+id/tutorial3_activity_java_surface_view" /> diff --git a/samples/android/tutorial-5-cameracontrol/res/values/strings.xml b/samples/android/tutorial-3-cameracontrol/res/values/strings.xml similarity index 52% rename from samples/android/tutorial-5-cameracontrol/res/values/strings.xml rename to samples/android/tutorial-3-cameracontrol/res/values/strings.xml index bf1a740ff..d3fb56d94 100644 --- a/samples/android/tutorial-5-cameracontrol/res/values/strings.xml +++ b/samples/android/tutorial-3-cameracontrol/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T5 Camera Control + OCV T3 Camera Control diff --git a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3Activity.java similarity index 92% rename from samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3Activity.java index f19580b49..28c00f3b1 100644 --- a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3Activity.java @@ -1,4 +1,4 @@ -package org.opencv.samples.tutorial5; +package org.opencv.samples.tutorial3; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,10 +28,10 @@ import android.view.View.OnTouchListener; import android.view.WindowManager; import android.widget.Toast; -public class Sample5CameraControl extends Activity implements CvCameraViewListener2, OnTouchListener { +public class Tutorial3Activity extends Activity implements CvCameraViewListener2, OnTouchListener { private static final String TAG = "OCVSample::Activity"; - private SampleJavaCameraView mOpenCvCameraView; + private Tutorial3View mOpenCvCameraView; private List mResolutionList; private MenuItem[] mEffectMenuItems; private SubMenu mColorEffectsMenu; @@ -46,7 +46,7 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen { Log.i(TAG, "OpenCV loaded successfully"); mOpenCvCameraView.enableView(); - mOpenCvCameraView.setOnTouchListener(Sample5CameraControl.this); + mOpenCvCameraView.setOnTouchListener(Tutorial3Activity.this); } break; default: { @@ -56,7 +56,7 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen } }; - public Sample5CameraControl() { + public Tutorial3Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } @@ -67,9 +67,9 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen super.onCreate(savedInstanceState); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - setContentView(R.layout.tutorial5_surface_view); + setContentView(R.layout.tutorial3_surface_view); - mOpenCvCameraView = (SampleJavaCameraView) findViewById(R.id.tutorial5_activity_java_surface_view); + mOpenCvCameraView = (Tutorial3View) findViewById(R.id.tutorial3_activity_java_surface_view); mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE); diff --git a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java similarity index 90% rename from samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java index da12bb098..04c163ff8 100644 --- a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java @@ -1,4 +1,4 @@ -package org.opencv.samples.tutorial5; +package org.opencv.samples.tutorial3; import java.io.FileOutputStream; import java.util.List; @@ -14,11 +14,11 @@ import android.hardware.Camera.Size; import android.util.AttributeSet; import android.util.Log; -public class SampleJavaCameraView extends JavaCameraView { +public class Tutorial3View extends JavaCameraView { - private static final String TAG = "Sample::SampleJavaCameraView"; + private static final String TAG = "Sample::Tutorial3View"; - public SampleJavaCameraView(Context context, AttributeSet attrs) { + public Tutorial3View(Context context, AttributeSet attrs) { super(context, attrs); } diff --git a/samples/android/tutorial-3-native/.classpath b/samples/android/tutorial-3-native/.classpath deleted file mode 100644 index d3bb07b44..000000000 --- a/samples/android/tutorial-3-native/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/samples/android/tutorial-3-native/.cproject b/samples/android/tutorial-3-native/.cproject deleted file mode 100644 index 0ea6ad649..000000000 --- a/samples/android/tutorial-3-native/.cproject +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-3-native/AndroidManifest.xml b/samples/android/tutorial-3-native/AndroidManifest.xml deleted file mode 100644 index 164b81d8d..000000000 --- a/samples/android/tutorial-3-native/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-3-native/jni/Android.mk b/samples/android/tutorial-3-native/jni/Android.mk deleted file mode 100644 index 372d65a1d..000000000 --- a/samples/android/tutorial-3-native/jni/Android.mk +++ /dev/null @@ -1,11 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -include ../../sdk/native/jni/OpenCV.mk - -LOCAL_MODULE := native_sample -LOCAL_SRC_FILES := jni_part.cpp -LOCAL_LDLIBS += -llog -ldl - -include $(BUILD_SHARED_LIBRARY) diff --git a/samples/android/tutorial-3-native/jni/jni_part.cpp b/samples/android/tutorial-3-native/jni/jni_part.cpp deleted file mode 100644 index aa9acac49..000000000 --- a/samples/android/tutorial-3-native/jni/jni_part.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include -#include -#include -#include - -using namespace std; -using namespace cv; - -extern "C" { -JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial3_Sample3Native_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); - -JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial3_Sample3Native_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) -{ - Mat& mGr = *(Mat*)addrGray; - Mat& mRgb = *(Mat*)addrRgba; - vector v; - - FastFeatureDetector detector(50); - detector.detect(mGr, v); - for( unsigned int i = 0; i < v.size(); i++ ) - { - const KeyPoint& kp = v[i]; - circle(mRgb, Point(kp.pt.x, kp.pt.y), 10, Scalar(255,0,0,255)); - } -} -} diff --git a/samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml b/samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml deleted file mode 100644 index 71cd6e04c..000000000 --- a/samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/samples/android/tutorial-3-native/res/values/strings.xml b/samples/android/tutorial-3-native/res/values/strings.xml deleted file mode 100644 index 41c54207e..000000000 --- a/samples/android/tutorial-3-native/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - OCV T3 Add Native OpenCV - diff --git a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java b/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java deleted file mode 100644 index 71990fab8..000000000 --- a/samples/android/tutorial-3-native/src/org/opencv/samples/tutorial3/Sample3Native.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.opencv.samples.tutorial3; - -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 android.app.Activity; -import android.os.Bundle; -import android.util.Log; -import android.view.WindowManager; - -public class Sample3Native extends Activity implements CvCameraViewListener2 { - private static final String TAG = "OCVSample::Activity"; - - private Mat mRgba; - private Mat mGray; - 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("native_sample"); - - mOpenCvCameraView.enableView(); - } break; - default: - { - super.onManagerConnected(status); - } break; - } - } - }; - - public Sample3Native() { - 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.tutorial3_surface_view); - - mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial4_activity_surface_view); - mOpenCvCameraView.setCvCameraViewListener(this); - } - - @Override - public void onPause() - { - super.onPause(); - if (mOpenCvCameraView != null) - mOpenCvCameraView.disableView(); - } - - @Override - public void onResume() - { - super.onResume(); - OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_3, 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); - mGray = new Mat(height, width, CvType.CV_8UC1); - } - - public void onCameraViewStopped() { - mRgba.release(); - mGray.release(); - } - - public Mat onCameraFrame(CvCameraViewFrame inputFrame) { - mRgba = inputFrame.rgba(); - mGray = inputFrame.gray(); - FindFeatures(mGray.getNativeObjAddr(), mRgba.getNativeObjAddr()); - - return mRgba; - } - - public native void FindFeatures(long matAddrGr, long matAddrRgba); -} diff --git a/samples/android/tutorial-4-mixed/.project b/samples/android/tutorial-4-mixed/.project deleted file mode 100644 index 901239480..000000000 --- a/samples/android/tutorial-4-mixed/.project +++ /dev/null @@ -1,101 +0,0 @@ - - - OpenCV Tutorial 4 - Mix Java+Native OpenCV - - - - - - 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-mixed/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2ddc..000000000 --- a/samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -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-mixed/AndroidManifest.xml b/samples/android/tutorial-4-mixed/AndroidManifest.xml deleted file mode 100644 index 22266fb76..000000000 --- a/samples/android/tutorial-4-mixed/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/android/tutorial-4-mixed/CMakeLists.txt b/samples/android/tutorial-4-mixed/CMakeLists.txt deleted file mode 100644 index 2fac5843b..000000000 --- a/samples/android/tutorial-4-mixed/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(sample example-tutorial-4-mixed) - -if(BUILD_FAT_JAVA_LIB) - set(native_deps opencv_java) -else() - set(native_deps opencv_features2d) -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() diff --git a/samples/android/tutorial-4-mixed/jni/Application.mk b/samples/android/tutorial-4-mixed/jni/Application.mk deleted file mode 100644 index 4fffcb283..000000000 --- a/samples/android/tutorial-4-mixed/jni/Application.mk +++ /dev/null @@ -1,4 +0,0 @@ -APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -fexceptions -APP_ABI := armeabi-v7a -APP_PLATFORM := android-8 diff --git a/samples/android/tutorial-4-mixed/res/drawable/icon.png b/samples/android/tutorial-4-mixed/res/drawable/icon.png deleted file mode 100644 index 630454927..000000000 Binary files a/samples/android/tutorial-4-mixed/res/drawable/icon.png and /dev/null differ diff --git a/samples/android/tutorial-4-mixed/res/layout/tutorial4_surface_view.xml b/samples/android/tutorial-4-mixed/res/layout/tutorial4_surface_view.xml deleted file mode 100644 index 71cd6e04c..000000000 --- a/samples/android/tutorial-4-mixed/res/layout/tutorial4_surface_view.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/samples/android/tutorial-4-mixed/res/values/strings.xml b/samples/android/tutorial-4-mixed/res/values/strings.xml deleted file mode 100644 index da2b018d6..000000000 --- a/samples/android/tutorial-4-mixed/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - OCV T4 Mix Java+Native OpenCV - diff --git a/samples/android/tutorial-5-cameracontrol/.classpath b/samples/android/tutorial-5-cameracontrol/.classpath deleted file mode 100644 index 3f9691c5d..000000000 --- a/samples/android/tutorial-5-cameracontrol/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/samples/android/tutorial-5-cameracontrol/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-5-cameracontrol/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2ddc..000000000 --- a/samples/android/tutorial-5-cameracontrol/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -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-5-cameracontrol/res/drawable/icon.png b/samples/android/tutorial-5-cameracontrol/res/drawable/icon.png deleted file mode 100644 index 630454927..000000000 Binary files a/samples/android/tutorial-5-cameracontrol/res/drawable/icon.png and /dev/null differ