From 72541721a15af1e26876ef6f264885a91e912f2e Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 18 Jul 2011 16:17:07 +0000 Subject: [PATCH] Added image-manipulations android sample, other samples are updated; added Mat.size method to java API. --- modules/java/src/cpp/Mat.cpp | 32 +++++ modules/java/src/java/Mat.java | 7 + samples/android/image-manipulations/.classpath | 8 ++ samples/android/image-manipulations/.project | 40 ++++++ .../.settings/org.eclipse.jdt.core.prefs | 5 + .../image-manipulations/AndroidManifest.xml | 31 +++++ .../android/image-manipulations/default.properties | 3 + .../image-manipulations/res/drawable/icon.png | Bin 0 -> 5760 bytes .../image-manipulations/res/values/strings.xml | 4 + .../ImageManipulationsActivity.java | 71 ++++++++++ .../imagemanipulations/ImageManipulationsView.java | 154 +++++++++++++++++++++ .../imagemanipulations/SampleCvViewBase.java | 108 +++++++++++++++ .../org/opencv/samples/tutorial1/Sample1Java.java | 10 -- .../org/opencv/samples/tutorial1/Sample1View.java | 9 -- .../samples/tutorial2/Sample2NativeCamera.java | 10 -- .../org/opencv/samples/tutorial2/Sample2View.java | 10 -- .../org/opencv/samples/tutorial4/Sample4Mixed.java | 10 -- .../org/opencv/samples/tutorial4/Sample4View.java | 9 -- 18 files changed, 463 insertions(+), 58 deletions(-) create mode 100644 samples/android/image-manipulations/.classpath create mode 100644 samples/android/image-manipulations/.project create mode 100644 samples/android/image-manipulations/.settings/org.eclipse.jdt.core.prefs create mode 100644 samples/android/image-manipulations/AndroidManifest.xml create mode 100644 samples/android/image-manipulations/default.properties create mode 100644 samples/android/image-manipulations/res/drawable/icon.png create mode 100644 samples/android/image-manipulations/res/values/strings.xml create mode 100644 samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java create mode 100644 samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java create mode 100644 samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java diff --git a/modules/java/src/cpp/Mat.cpp b/modules/java/src/cpp/Mat.cpp index 83b0244..65fb738 100644 --- a/modules/java/src/cpp/Mat.cpp +++ b/modules/java/src/cpp/Mat.cpp @@ -47,6 +47,38 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_Mat_nIsEmpty return me->empty(); } +JNIEXPORT jdoubleArray JNICALL Java_org_opencv_Mat_nSize + (JNIEnv* env, jclass cls, jlong self) +{ + try { +#ifdef DEBUG + LOGD("core::Mat::nSize()"); +#endif // DEBUG + cv::Mat* me = (cv::Mat*) self; //TODO: check for NULL + cv::Size _retval_ = me->size(); + + jdoubleArray _da_retval_ = env->NewDoubleArray(2); + jdouble _tmp_retval_[4] = {_retval_.width, _retval_.height}; + env->SetDoubleArrayRegion(_da_retval_, 0, 2, _tmp_retval_); + return _da_retval_; + } catch(cv::Exception e) { +#ifdef DEBUG + LOGD("core::Mat::nSize() catched cv::Exception: %s", e.what()); +#endif // DEBUG + jclass je = env->FindClass("org/opencv/CvException"); + if(!je) je = env->FindClass("java/lang/Exception"); + env->ThrowNew(je, e.what()); + return 0; + } catch (...) { +#ifdef DEBUG + LOGD("core::Mat::nSize() catched unknown exception (...)"); +#endif // DEBUG + jclass je = env->FindClass("java/lang/Exception"); + env->ThrowNew(je, "Unknown exception in JNI code {core::n_1mean__JJ()}"); + return 0; + } +} + JNIEXPORT jboolean JNICALL Java_org_opencv_Mat_nIsCont (JNIEnv* env, jclass cls, jlong self) { diff --git a/modules/java/src/java/Mat.java b/modules/java/src/java/Mat.java index 4358424..dd8e8f5 100644 --- a/modules/java/src/java/Mat.java +++ b/modules/java/src/java/Mat.java @@ -71,6 +71,12 @@ public class Mat { return nIsEmpty(nativeObj); } + //javadoc:Mat::size() + public Size Size() { + if(nativeObj == 0) return new Size(); + return new Size(nSize(nativeObj)); + } + private void checkNull() { if(nativeObj == 0) throw new java.lang.UnsupportedOperationException("Native object address is NULL"); @@ -334,6 +340,7 @@ public class Mat { private static native boolean nIsEmpty(long self); private static native boolean nIsCont(long self); private static native boolean nIsSubmat(long self); + private static native double[] nSize(long self); private static native long nSubmat(long self, int rowStart, int rowEnd, int colStart, int colEnd); private static native long nClone(long self); private static native int nPutD(long self, int row, int col, int count, double[] data); diff --git a/samples/android/image-manipulations/.classpath b/samples/android/image-manipulations/.classpath new file mode 100644 index 0000000..a0a90f9 --- /dev/null +++ b/samples/android/image-manipulations/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/samples/android/image-manipulations/.project b/samples/android/image-manipulations/.project new file mode 100644 index 0000000..6c7d5fd --- /dev/null +++ b/samples/android/image-manipulations/.project @@ -0,0 +1,40 @@ + + + image-manipulations + + + + + + 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 + + + + OpenCV-2.3.1_src + 2 + _android_OpenCV_2_3_1_df28900a/src + + + diff --git a/samples/android/image-manipulations/.settings/org.eclipse.jdt.core.prefs b/samples/android/image-manipulations/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..d995784 --- /dev/null +++ b/samples/android/image-manipulations/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Wed Jun 29 04:36:40 MSD 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/samples/android/image-manipulations/AndroidManifest.xml b/samples/android/image-manipulations/AndroidManifest.xml new file mode 100644 index 0000000..ab32003 --- /dev/null +++ b/samples/android/image-manipulations/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/android/image-manipulations/default.properties b/samples/android/image-manipulations/default.properties new file mode 100644 index 0000000..fb3ea1f --- /dev/null +++ b/samples/android/image-manipulations/default.properties @@ -0,0 +1,3 @@ +android.library.reference.1=../../../android/build +# Project target. +target=android-8 diff --git a/samples/android/image-manipulations/res/drawable/icon.png b/samples/android/image-manipulations/res/drawable/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4e828bafd86aae740c6d4da0af6cc67653b535a5 GIT binary patch literal 5760 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 V9}r2j|9cq#=xN{7s@8Of{2yTISoHt^ literal 0 HcmV?d00001 diff --git a/samples/android/image-manipulations/res/values/strings.xml b/samples/android/image-manipulations/res/values/strings.xml new file mode 100644 index 0000000..630c8e3 --- /dev/null +++ b/samples/android/image-manipulations/res/values/strings.xml @@ -0,0 +1,4 @@ + + + image-manipulations + diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java new file mode 100644 index 0000000..d41f980 --- /dev/null +++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java @@ -0,0 +1,71 @@ +package org.opencv.samples.imagemanipulations; + +import android.app.Activity; +import android.os.Bundle; +import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; +import android.view.Window; + +public class ImageManipulationsActivity extends Activity { + private static final String TAG = "Sample::Activity"; + + public static final int VIEW_MODE_RGBA = 0; + public static final int VIEW_MODE_CANNY = 1; + public static final int VIEW_MODE_SEPIA = 2; + public static final int VIEW_MODE_SOBEL = 3; + public static final int VIEW_MODE_BLUR = 4; + public static final int VIEW_MODE_ZOOM = 5; + + private MenuItem mItemPreviewRGBA; + private MenuItem mItemPreviewCanny; + private MenuItem mItemPreviewSepia; + private MenuItem mItemPreviewSobel; + private MenuItem mItemPreviewBlur; + private MenuItem mItemPreviewZoom; + + public static int viewMode = VIEW_MODE_RGBA; + + public ImageManipulationsActivity() { + Log.i(TAG, "Instantiated new " + this.getClass()); + } + + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) { + Log.i(TAG, "onCreate"); + super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_NO_TITLE); + setContentView(new ImageManipulationsView(this)); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + Log.i(TAG, "onCreateOptionsMenu"); + mItemPreviewRGBA = menu.add("Preview RGBA"); + mItemPreviewCanny = menu.add("Canny"); + mItemPreviewSepia = menu.add("Sepia"); + mItemPreviewSobel = menu.add("Sobel"); + mItemPreviewBlur = menu.add("Blur"); + mItemPreviewZoom = menu.add("Zoom"); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + Log.i(TAG, "Menu Item selected " + item); + if (item == mItemPreviewRGBA) + viewMode = VIEW_MODE_RGBA; + else if (item == mItemPreviewCanny) + viewMode = VIEW_MODE_CANNY; + else if (item == mItemPreviewSepia) + viewMode = VIEW_MODE_SEPIA; + else if (item == mItemPreviewSobel) + viewMode = VIEW_MODE_SOBEL; + else if (item == mItemPreviewBlur) + viewMode = VIEW_MODE_BLUR; + else if (item == mItemPreviewZoom) + viewMode = VIEW_MODE_ZOOM; + return true; + } +} diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java new file mode 100644 index 0000000..cf4a0f8 --- /dev/null +++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java @@ -0,0 +1,154 @@ +package org.opencv.samples.imagemanipulations; + +import org.opencv.*; + +import android.content.Context; +import android.graphics.Bitmap; +import android.view.SurfaceHolder; + +class ImageManipulationsView extends SampleCvViewBase { + private Mat mRgba; + private Mat mGray; + private Mat mIntermediateMat; + + private Mat mRgbaInnerWindow; + private Mat mGrayInnerWindow; + private Mat mBlurWindow; + private Mat mZoomWindow; + private Mat mZoomCorner; + + private Mat mSepiaKernel; + + public ImageManipulationsView(Context context) { + super(context); + + mSepiaKernel = new Mat(4, 4, CvType.CV_32F); + mSepiaKernel.put(0, 0, /* R */0.189f, 0.769f, 0.393f, 0f); + mSepiaKernel.put(1, 0, /* G */0.168f, 0.686f, 0.349f, 0f); + mSepiaKernel.put(2, 0, /* B */0.131f, 0.534f, 0.272f, 0f); + mSepiaKernel.put(3, 0, /* A */0.000f, 0.000f, 0.000f, 1f); + } + + @Override + public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) { + super.surfaceChanged(_holder, format, width, height); + + synchronized (this) { + // initialize Mats before usage + mGray = new Mat(); + mRgba = new Mat(); + mIntermediateMat = new Mat(); + } + } + + private void CreateAuxiliaryMats() { + if (mRgba.empty()) + return; + + int rows = mRgba.rows(); + int cols = mRgba.cols(); + + int left = cols / 8; + int top = rows / 8; + + int width = cols * 3 / 4; + int height = rows * 3 / 4; + + if (mRgbaInnerWindow == null) + mRgbaInnerWindow = mRgba.submat(top, top + height, left, left + width); + + if (mGrayInnerWindow == null && !mGray.empty()) + mGrayInnerWindow = mGray.submat(top, top + height, left, left + width); + + if (mBlurWindow == null) + mBlurWindow = mRgba.submat(0, rows, cols / 3, cols * 2 / 3); + + if (mZoomCorner == null) + mZoomCorner = mRgba.submat(0, rows / 2 - rows / 10, 0, cols / 2 - cols / 10); + + if (mZoomWindow == null) + mZoomWindow = mRgba.submat(rows / 2 - 9 * rows / 100, rows / 2 + 9 * rows / 100, cols / 2 - 9 * cols / 100, cols / 2 + 9 * cols / 100); + } + + @Override + protected Bitmap processFrame(VideoCapture capture) { + switch (ImageManipulationsActivity.viewMode) { + + case ImageManipulationsActivity.VIEW_MODE_RGBA: + capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); + break; + + case ImageManipulationsActivity.VIEW_MODE_CANNY: + capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); + capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME); + + if (mRgbaInnerWindow == null || mGrayInnerWindow == null) + CreateAuxiliaryMats(); + + imgproc.Canny(mGrayInnerWindow, mGrayInnerWindow, 80, 90); + imgproc.cvtColor(mGrayInnerWindow, mRgbaInnerWindow, imgproc.CV_GRAY2BGRA, 4); + break; + + case ImageManipulationsActivity.VIEW_MODE_SOBEL: + capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); + capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME); + + if (mRgbaInnerWindow == null || mGrayInnerWindow == null) + CreateAuxiliaryMats(); + + imgproc.Sobel(mGrayInnerWindow, mIntermediateMat, CvType.CV_8U, 1, 1); + core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 10); + imgproc.cvtColor(mIntermediateMat, mRgbaInnerWindow, imgproc.CV_GRAY2BGRA, 4); + break; + + case ImageManipulationsActivity.VIEW_MODE_SEPIA: + capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); + core.transform(mRgba, mRgba, mSepiaKernel); + break; + + case ImageManipulationsActivity.VIEW_MODE_BLUR: + capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); + if (mBlurWindow == null) + CreateAuxiliaryMats(); + imgproc.blur(mBlurWindow, mBlurWindow, new Size(15, 15)); + break; + + case ImageManipulationsActivity.VIEW_MODE_ZOOM: + capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); + if (mZoomCorner == null || mZoomWindow == null) + CreateAuxiliaryMats(); + imgproc.resize(mZoomWindow, mZoomCorner, mZoomCorner.Size()); + + Size wsize = mZoomWindow.Size(); + core.rectangle(mZoomWindow, new Point(1, 1), new Point(wsize.width - 2, wsize.height - 2), new Scalar(255, 0, 0, 255), 2); + break; + } + + Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888); + + if (android.MatToBitmap(mRgba, bmp)) + return bmp; + + bmp.recycle(); + return null; + } + + @Override + public void run() { + super.run(); + + synchronized (this) { + // Explicitly deallocate Mats + if (mRgba != null) + mRgba.dispose(); + if (mGray != null) + mGray.dispose(); + if (mIntermediateMat != null) + mIntermediateMat.dispose(); + + mRgba = null; + mGray = null; + mIntermediateMat = null; + } + } +} \ No newline at end of file diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java new file mode 100644 index 0000000..76f8f73 --- /dev/null +++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/SampleCvViewBase.java @@ -0,0 +1,108 @@ +package org.opencv.samples.imagemanipulations; + +import java.util.List; + +import org.opencv.*; + +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.util.Log; +import android.view.SurfaceHolder; +import android.view.SurfaceView; + +public abstract class SampleCvViewBase extends SurfaceView implements SurfaceHolder.Callback, Runnable { + private static final String TAG = "Sample::SurfaceView"; + + private SurfaceHolder mHolder; + private VideoCapture mCamera; + + public SampleCvViewBase(Context context) { + super(context); + mHolder = getHolder(); + mHolder.addCallback(this); + Log.i(TAG, "Instantiated new " + this.getClass()); + } + + public void surfaceChanged(SurfaceHolder _holder, int format, int width, int height) { + Log.i(TAG, "surfaceCreated"); + synchronized (this) { + if (mCamera != null && mCamera.isOpened()) { + Log.i(TAG, "before mCamera.getSupportedPreviewSizes()"); + List sizes = mCamera.getSupportedPreviewSizes(); + Log.i(TAG, "after 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); + } + } + } + + public void surfaceCreated(SurfaceHolder holder) { + Log.i(TAG, "surfaceCreated"); + mCamera = new VideoCapture(highgui.CV_CAP_ANDROID); + if (mCamera.isOpened()) { + (new Thread(this)).start(); + } else { + mCamera.release(); + mCamera = null; + Log.e(TAG, "Failed to open native camera"); + } + } + + public void surfaceDestroyed(SurfaceHolder holder) { + Log.i(TAG, "surfaceDestroyed"); + if (mCamera != null) { + synchronized (this) { + mCamera.release(); + mCamera = null; + } + } + } + + protected abstract Bitmap processFrame(VideoCapture capture); + + public void run() { + Log.i(TAG, "Starting processing thread"); + while (true) { + Bitmap bmp = null; + + synchronized (this) { + if (mCamera == null) + break; + + if (!mCamera.grab()) { + Log.e(TAG, "mCamera.grab() failed"); + break; + } + + bmp = processFrame(mCamera); + } + + if (bmp != null) { + Canvas canvas = mHolder.lockCanvas(); + if (canvas != null) { + canvas.drawBitmap(bmp, (canvas.getWidth() - bmp.getWidth()) / 2, (canvas.getHeight() - bmp.getHeight()) / 2, null); + mHolder.unlockCanvasAndPost(canvas); + } + bmp.recycle(); + } + } + + Log.i(TAG, "Finishing processing thread"); + } +} \ No newline at end of file diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java index 2cf8300..f05ee33 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java @@ -13,14 +13,10 @@ public class Sample1Java extends 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; - public static final int VIEW_MODE_SOBEL = 3; - public static final int VIEW_MODE_BLUR = 4; private MenuItem mItemPreviewRGBA; private MenuItem mItemPreviewGray; private MenuItem mItemPreviewCanny; - private MenuItem mItemPreviewSobel; - private MenuItem mItemPreviewBlur; public static int viewMode = VIEW_MODE_RGBA; @@ -43,8 +39,6 @@ public class Sample1Java extends Activity { mItemPreviewRGBA = menu.add("Preview RGBA"); mItemPreviewGray = menu.add("Preview GRAY"); mItemPreviewCanny = menu.add("Canny"); - mItemPreviewSobel = menu.add("Sobel"); - mItemPreviewBlur = menu.add("Blur"); return true; } @@ -57,10 +51,6 @@ public class Sample1Java extends Activity { viewMode = VIEW_MODE_GRAY; else if (item == mItemPreviewCanny) viewMode = VIEW_MODE_CANNY; - else if (item == mItemPreviewSobel) - viewMode = VIEW_MODE_SOBEL; - else if (item == mItemPreviewBlur) - viewMode = VIEW_MODE_BLUR; return true; } } diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java index 8420e89..04cb9ed 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java +++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java @@ -46,15 +46,6 @@ class Sample1View extends SampleViewBase { imgproc.Canny(mGraySubmat, mIntermediateMat, 80, 100); imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); break; - case Sample1Java.VIEW_MODE_SOBEL: - imgproc.Sobel(mGraySubmat, mIntermediateMat, CvType.CV_8U, 1, 1); - core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 8); - imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); - break; - case Sample1Java.VIEW_MODE_BLUR: - imgproc.cvtColor(mYuv, mRgba, imgproc.CV_YUV420i2RGB, 4); - imgproc.blur(mRgba, mRgba, new Size(15, 15)); - break; } Bitmap bmp = Bitmap.createBitmap(getFrameWidth(), getFrameHeight(), Bitmap.Config.ARGB_8888); 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 index 9697916..de3fbb5 100644 --- 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 @@ -13,14 +13,10 @@ public class Sample2NativeCamera extends 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; - public static final int VIEW_MODE_SOBEL = 3; - public static final int VIEW_MODE_BLUR = 4; private MenuItem mItemPreviewRGBA; private MenuItem mItemPreviewGray; private MenuItem mItemPreviewCanny; - private MenuItem mItemPreviewSobel; - private MenuItem mItemPreviewBlur; public static int viewMode = VIEW_MODE_RGBA; @@ -43,8 +39,6 @@ public class Sample2NativeCamera extends Activity { mItemPreviewRGBA = menu.add("Preview RGBA"); mItemPreviewGray = menu.add("Preview GRAY"); mItemPreviewCanny = menu.add("Canny"); - mItemPreviewSobel = menu.add("Sobel"); - mItemPreviewBlur = menu.add("Blur"); return true; } @@ -57,10 +51,6 @@ public class Sample2NativeCamera extends Activity { viewMode = VIEW_MODE_GRAY; else if (item == mItemPreviewCanny) viewMode = VIEW_MODE_CANNY; - else if (item == mItemPreviewSobel) - viewMode = VIEW_MODE_SOBEL; - else if (item == mItemPreviewBlur) - viewMode = VIEW_MODE_BLUR; return true; } } diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java index 22e77b0..e57751f 100644 --- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java +++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java @@ -43,16 +43,6 @@ class Sample2View extends SampleCvViewBase { imgproc.Canny(mGray, mIntermediateMat, 80, 100); imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); break; - case Sample2NativeCamera.VIEW_MODE_SOBEL: - capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME); - imgproc.Sobel(mGray, mIntermediateMat, CvType.CV_8U, 1, 1); - core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 8); - imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); - break; - case Sample2NativeCamera.VIEW_MODE_BLUR: - capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); - imgproc.blur(mRgba, mRgba, new Size(15, 15)); - break; } Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888); diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java index b8c3820..0c5eda4 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java @@ -13,15 +13,11 @@ public class Sample4Mixed extends 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; - public static final int VIEW_MODE_SOBEL = 3; - public static final int VIEW_MODE_BLUR = 4; public static final int VIEW_MODE_FEATURES = 5; private MenuItem mItemPreviewRGBA; private MenuItem mItemPreviewGray; private MenuItem mItemPreviewCanny; - private MenuItem mItemPreviewSobel; - private MenuItem mItemPreviewBlur; private MenuItem mItemPreviewFeatures; public static int viewMode = VIEW_MODE_RGBA; @@ -44,8 +40,6 @@ public class Sample4Mixed extends Activity { mItemPreviewRGBA = menu.add("Preview RGBA"); mItemPreviewGray = menu.add("Preview GRAY"); mItemPreviewCanny = menu.add("Canny"); - mItemPreviewSobel = menu.add("Sobel"); - mItemPreviewBlur = menu.add("Blur"); mItemPreviewFeatures = menu.add("Find features"); return true; } @@ -58,10 +52,6 @@ public class Sample4Mixed extends Activity { viewMode = VIEW_MODE_GRAY; else if (item == mItemPreviewCanny) viewMode = VIEW_MODE_CANNY; - else if (item == mItemPreviewSobel) - viewMode = VIEW_MODE_SOBEL; - else if (item == mItemPreviewBlur) - viewMode = VIEW_MODE_BLUR; else if (item == mItemPreviewFeatures) viewMode = VIEW_MODE_FEATURES; return true; diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java index b8e54f8..7f73acf 100644 --- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java +++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java @@ -45,15 +45,6 @@ class Sample4View extends SampleViewBase { imgproc.Canny(mGraySubmat, mIntermediateMat, 80, 100); imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); break; - case Sample4Mixed.VIEW_MODE_SOBEL: - imgproc.Sobel(mGraySubmat, mIntermediateMat, CvType.CV_8U, 1, 1); - core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 8); - imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); - break; - case Sample4Mixed.VIEW_MODE_BLUR: - imgproc.cvtColor(mYuv, mRgba, imgproc.CV_YUV420i2RGB, 4); - imgproc.blur(mRgba, mRgba, new Size(15, 15)); - break; case Sample4Mixed.VIEW_MODE_FEATURES: imgproc.cvtColor(mYuv, mRgba, imgproc.CV_YUV420i2RGB, 4); FindFeatures(mGraySubmat.getNativeObjAddr(), mRgba.getNativeObjAddr()); -- 2.7.4