From a9427470464de55fa6f09700ef6e51a63584a14b Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 23 Oct 2012 17:00:14 +0400 Subject: [PATCH] Code review coments fixed. Lint wornings fixed. --- ...java => android+CameraBridgeViewBase.java} | 8 +-- ...aView.java => android+JavaCameraView.java} | 23 ++----- ...iew.java => android+NativeCameraView.java} | 68 +++++++++---------- .../.settings/org.eclipse.jdt.core.prefs | 4 ++ .../res/layout/activity_puzzle15.xml | 2 +- .../samples/puzzle15/Puzzle15Activity.java | 12 ++-- .../android/color-blob-detection/.classpath | 4 +- .../color_blob_detection_surface_view.xml | 2 +- .../ColorBlobDetectionActivity.java | 8 +-- samples/android/face-detection/.classpath | 4 +- .../res/layout/face_detect_surface_view.xml | 2 +- .../src/org/opencv/samples/fd/FdActivity.java | 8 +-- .../android/image-manipulations/.classpath | 4 +- .../image_manipulations_surface_view.xml | 2 +- .../ImageManipulationsActivity.java | 8 +-- .../tutorial-0-androidcamera/.classpath | 4 +- .../android/tutorial-1-addopencv/.classpath | 4 +- .../res/layout/tutorial1_surface_view.xml | 2 +- .../opencv/samples/tutorial1/Sample1Java.java | 8 +-- .../tutorial-2-opencvcamera/.classpath | 4 +- .../res/layout/tutorial2_surface_view.xml | 2 +- .../tutorial2/Sample2NativeCamera.java | 8 +-- samples/android/tutorial-3-native/.classpath | 4 +- .../res/layout/tutorial3_surface_view.xml | 2 +- .../samples/tutorial3/Sample3Native.java | 10 +-- samples/android/tutorial-4-mixed/.classpath | 4 +- .../res/layout/tutorial4_surface_view.xml | 2 +- .../samples/tutorial4/Sample4Mixed.java | 8 +-- 28 files changed, 103 insertions(+), 118 deletions(-) rename modules/java/generator/src/java/{framework+OpenCvCameraBridgeViewBase.java => android+CameraBridgeViewBase.java} (97%) rename modules/java/generator/src/java/{framework+OpenCvJavaCameraView.java => android+JavaCameraView.java} (92%) rename modules/java/generator/src/java/{framework+OpenCvNativeCameraView.java => android+NativeCameraView.java} (66%) create mode 100644 samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs diff --git a/modules/java/generator/src/java/framework+OpenCvCameraBridgeViewBase.java b/modules/java/generator/src/java/android+CameraBridgeViewBase.java similarity index 97% rename from modules/java/generator/src/java/framework+OpenCvCameraBridgeViewBase.java rename to modules/java/generator/src/java/android+CameraBridgeViewBase.java index e3163ff763..444e4fa7af 100644 --- a/modules/java/generator/src/java/framework+OpenCvCameraBridgeViewBase.java +++ b/modules/java/generator/src/java/android+CameraBridgeViewBase.java @@ -1,4 +1,4 @@ -package org.opencv.framework; +package org.opencv.android; import java.util.List; @@ -26,7 +26,7 @@ import android.view.SurfaceView; * The clients shall implement CvCameraViewListener * TODO: add method to control the format in which the frames will be delivered to CvCameraViewListener */ -public abstract class OpenCvCameraBridgeViewBase extends SurfaceView implements SurfaceHolder.Callback { +public abstract class CameraBridgeViewBase extends SurfaceView implements SurfaceHolder.Callback { private static final int MAX_UNSPECIFIED = -1; @@ -40,7 +40,7 @@ public abstract class OpenCvCameraBridgeViewBase extends SurfaceView implements private Bitmap mCacheBitmap; - public OpenCvCameraBridgeViewBase(Context context, AttributeSet attrs) { + public CameraBridgeViewBase(Context context, AttributeSet attrs) { super(context, attrs); getHolder().addCallback(this); mMaxWidth = MAX_UNSPECIFIED; @@ -74,7 +74,7 @@ public abstract class OpenCvCameraBridgeViewBase extends SurfaceView implements private static final int STOPPED = 0; private static final int STARTED = 1; - private static final String TAG = "OpenCvCameraBridge"; + private static final String TAG = "CameraBridge"; private CvCameraViewListener mListener; private int mState = STOPPED; diff --git a/modules/java/generator/src/java/framework+OpenCvJavaCameraView.java b/modules/java/generator/src/java/android+JavaCameraView.java similarity index 92% rename from modules/java/generator/src/java/framework+OpenCvJavaCameraView.java rename to modules/java/generator/src/java/android+JavaCameraView.java index 05e44463cb..a4ab627d0c 100644 --- a/modules/java/generator/src/java/framework+OpenCvJavaCameraView.java +++ b/modules/java/generator/src/java/android+JavaCameraView.java @@ -1,4 +1,4 @@ -package org.opencv.framework; +package org.opencv.android; import java.io.IOException; import java.util.List; @@ -29,10 +29,10 @@ import org.opencv.imgproc.Imgproc; * When frame is delivered via callback from Camera - it processed via OpenCV to be * converted to RGBA32 and then passed to the external callback for modifications if required. */ -public class OpenCvJavaCameraView extends OpenCvCameraBridgeViewBase implements PreviewCallback { +public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallback { private static final int MAGIC_TEXTURE_ID = 10; - private static final String TAG = "OpenCvJavaCameraView"; + private static final String TAG = "JavaCameraView"; private Mat mBaseMat; private byte mBuffer[]; @@ -55,7 +55,7 @@ public class OpenCvJavaCameraView extends OpenCvCameraBridgeViewBase implements private Camera mCamera; - public OpenCvJavaCameraView(Context context, AttributeSet attrs) { + public JavaCameraView(Context context, AttributeSet attrs) { super(context, attrs); } @@ -159,7 +159,7 @@ public class OpenCvJavaCameraView extends OpenCvCameraBridgeViewBase implements /* now we can start update thread */ Log.d(TAG, "Starting processing thread"); mStopThread = false; - mThread = new Thread(new CameraWorker(getWidth(), getHeight())); + mThread = new Thread(new CameraWorker()); mThread.start(); return true; @@ -202,20 +202,11 @@ public class OpenCvJavaCameraView extends OpenCvCameraBridgeViewBase implements private class CameraWorker implements Runnable { - private Mat mRgba = new Mat(); - private int mWidth; - private int mHeight; - - CameraWorker(int w, int h) { - mWidth = w; - mHeight = h; - } - public void run() { do { - synchronized (OpenCvJavaCameraView.this) { + synchronized (JavaCameraView.this) { try { - OpenCvJavaCameraView.this.wait(); + JavaCameraView.this.wait(); } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/modules/java/generator/src/java/framework+OpenCvNativeCameraView.java b/modules/java/generator/src/java/android+NativeCameraView.java similarity index 66% rename from modules/java/generator/src/java/framework+OpenCvNativeCameraView.java rename to modules/java/generator/src/java/android+NativeCameraView.java index 90f5d8a0ea..a62d6bb5c7 100644 --- a/modules/java/generator/src/java/framework+OpenCvNativeCameraView.java +++ b/modules/java/generator/src/java/android+NativeCameraView.java @@ -1,14 +1,11 @@ -package org.opencv.framework; +package org.opencv.android; -import org.opencv.android.Utils; import org.opencv.core.Mat; import org.opencv.core.Size; import org.opencv.highgui.Highgui; import org.opencv.highgui.VideoCapture; import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; import android.util.AttributeSet; import android.util.Log; @@ -17,31 +14,32 @@ import android.util.Log; * Due to the big amount of work done, by the base class this child is only responsible * for creating camera, destroying camera and delivering frames while camera is enabled */ -public class OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase { +public class NativeCameraView extends CameraBridgeViewBase { - public static final String TAG = "OpenCvNativeCameraView"; + public static final String TAG = "NativeCameraView"; private boolean mStopThread; private Thread mThread; private VideoCapture mCamera; - - public OpenCvNativeCameraView(Context context, AttributeSet attrs) { + public NativeCameraView(Context context, AttributeSet attrs) { super(context, attrs); } - @Override - protected void connectCamera(int width, int height) { + protected boolean connectCamera(int width, int height) { /* 1. We need to instantiate camera * 2. We need to start thread which will be getting frames */ /* First step - initialize camera connection */ - initializeCamera(getWidth(), getHeight()); + if (!initializeCamera(getWidth(), getHeight())) + return false; /* now we can start update thread */ - mThread = new Thread(new CameraWorker(getWidth(), getHeight())); + mThread = new Thread(new CameraWorker()); mThread.start(); + + return true; } @Override @@ -61,7 +59,6 @@ public class OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase { /* Now release camera */ releaseCamera(); - } public static class OpenCvSizeAccessor implements ListItemAccessor { @@ -78,32 +75,39 @@ public class OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase { } - private void initializeCamera(int width, int height) { - mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID); - //TODO: improve error handling + private boolean initializeCamera(int width, int height) { + synchronized (this) { + mCamera = new VideoCapture(Highgui.CV_CAP_ANDROID); - java.util.List sizes = mCamera.getSupportedPreviewSizes(); + if (mCamera == null) + return false; - /* Select the size that fits surface considering maximum size allowed */ - FrameSize frameSize = calculateCameraFrameSize(sizes, new OpenCvSizeAccessor(), width, height); + //TODO: improve error handling + java.util.List sizes = mCamera.getSupportedPreviewSizes(); - double frameWidth = frameSize.width; - double frameHeight = frameSize.height; + /* Select the size that fits surface considering maximum size allowed */ + Size frameSize = calculateCameraFrameSize(sizes, new OpenCvSizeAccessor(), width, height); + mFrameWidth = (int)frameSize.width; + mFrameHeight = (int)frameSize.height; - mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, frameWidth); - mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, frameHeight); + AllocateCache(); - mFrameWidth = (int)frameWidth; - mFrameHeight = (int)frameHeight; + mCamera.set(Highgui.CV_CAP_PROP_FRAME_WIDTH, frameSize.width); + mCamera.set(Highgui.CV_CAP_PROP_FRAME_HEIGHT, frameSize.height); + } Log.i(TAG, "Selected camera frame size = (" + mFrameWidth + ", " + mFrameHeight + ")"); + + return true; } private void releaseCamera() { - if (mCamera != null) { - mCamera.release(); + synchronized (this) { + if (mCamera != null) { + mCamera.release(); + } } } @@ -111,18 +115,8 @@ public class OpenCvNativeCameraView extends OpenCvCameraBridgeViewBase { private Mat mRgba = new Mat(); private Mat mGray = new Mat(); - private int mWidth; - private int mHeight; - - CameraWorker(int w, int h) { - mWidth = w; - mHeight = h; - } public void run() { - Mat modified; - - do { if (!mCamera.grab()) { Log.e(TAG, "Camera frame grab failed"); diff --git a/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs b/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..f77b31c2d2 --- /dev/null +++ b/samples/android/15-puzzle/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +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/15-puzzle/res/layout/activity_puzzle15.xml b/samples/android/15-puzzle/res/layout/activity_puzzle15.xml index 1522afad0c..3257ed801c 100644 --- a/samples/android/15-puzzle/res/layout/activity_puzzle15.xml +++ b/samples/android/15-puzzle/res/layout/activity_puzzle15.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java index 935983c556..e72dbbaee3 100644 --- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java +++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/Puzzle15Activity.java @@ -4,8 +4,8 @@ import org.opencv.android.BaseLoaderCallback; import org.opencv.android.LoaderCallbackInterface; import org.opencv.android.OpenCVLoader; import org.opencv.core.Mat; -import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener; -import org.opencv.framework.OpenCvJavaCameraView; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener; +import org.opencv.android.JavaCameraView; import android.os.Bundle; import android.app.Activity; @@ -20,7 +20,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener, private static final String TAG = "Sample::Puzzle15::Activity"; - private OpenCvJavaCameraView mOpenCvCameraView; + private JavaCameraView mOpenCvCameraView; private Puzzle15Processor mPuzzle15; private int mGameWidth; @@ -54,7 +54,7 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener, setContentView(R.layout.activity_puzzle15); - mOpenCvCameraView = (OpenCvJavaCameraView) findViewById(R.id.puzzle_activity_surface_view); + mOpenCvCameraView = (JavaCameraView) findViewById(R.id.puzzle_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); mPuzzle15 = new Puzzle15Processor(); mPuzzle15.prepareNewGame(); @@ -98,23 +98,19 @@ public class Puzzle15Activity extends Activity implements CvCameraViewListener, return true; } - @Override public void onCameraViewStarted(int width, int height) { mGameWidth = width; mGameHeight = height; mPuzzle15.prepareGameSize(width, height); } - @Override public void onCameraViewStopped() { } - @Override public Mat onCameraFrame(Mat inputFrame) { return mPuzzle15.puzzleFrame(inputFrame); } - @Override public boolean onTouch(View view, MotionEvent event) { int xpos, ypos; diff --git a/samples/android/color-blob-detection/.classpath b/samples/android/color-blob-detection/.classpath index a4763d1eec..3f9691c5dd 100644 --- a/samples/android/color-blob-detection/.classpath +++ b/samples/android/color-blob-detection/.classpath @@ -1,8 +1,8 @@ - - + + diff --git a/samples/android/color-blob-detection/res/layout/color_blob_detection_surface_view.xml b/samples/android/color-blob-detection/res/layout/color_blob_detection_surface_view.xml index f31d0460ec..94531a60dc 100644 --- a/samples/android/color-blob-detection/res/layout/color_blob_detection_surface_view.xml +++ b/samples/android/color-blob-detection/res/layout/color_blob_detection_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - diff --git a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java index ccba0a1946..d772bb8aa7 100644 --- a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java +++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java @@ -12,8 +12,8 @@ import org.opencv.core.MatOfPoint; import org.opencv.core.Rect; import org.opencv.core.Scalar; import org.opencv.core.Size; -import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener; -import org.opencv.framework.OpenCvJavaCameraView; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener; +import org.opencv.android.JavaCameraView; import org.opencv.imgproc.Imgproc; import android.app.Activity; @@ -37,7 +37,7 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe private Size SPECTRUM_SIZE; private Scalar CONTOUR_COLOR; - private OpenCvJavaCameraView mOpenCvCameraView; + private JavaCameraView mOpenCvCameraView; private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { @Override @@ -71,7 +71,7 @@ public class ColorBlobDetectionActivity extends Activity implements OnTouchListe setContentView(R.layout.color_blob_detection_surface_view); - mOpenCvCameraView = (OpenCvJavaCameraView)findViewById(R.id.color_blob_detection_activity_surface_view); + mOpenCvCameraView = (JavaCameraView)findViewById(R.id.color_blob_detection_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); } diff --git a/samples/android/face-detection/.classpath b/samples/android/face-detection/.classpath index a4763d1eec..3f9691c5dd 100644 --- a/samples/android/face-detection/.classpath +++ b/samples/android/face-detection/.classpath @@ -1,8 +1,8 @@ - - + + diff --git a/samples/android/face-detection/res/layout/face_detect_surface_view.xml b/samples/android/face-detection/res/layout/face_detect_surface_view.xml index 57027643a5..68d8fb4ec7 100644 --- a/samples/android/face-detection/res/layout/face_detect_surface_view.xml +++ b/samples/android/face-detection/res/layout/face_detect_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - diff --git a/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java b/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java index 1009261fad..7a2808cf54 100644 --- a/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java +++ b/samples/android/face-detection/src/org/opencv/samples/fd/FdActivity.java @@ -14,8 +14,8 @@ import org.opencv.core.MatOfRect; import org.opencv.core.Rect; import org.opencv.core.Scalar; import org.opencv.core.Size; -import org.opencv.framework.OpenCvJavaCameraView; -import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener; +import org.opencv.android.JavaCameraView; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener; import org.opencv.imgproc.Imgproc; import org.opencv.objdetect.CascadeClassifier; @@ -53,7 +53,7 @@ public class FdActivity extends Activity implements CvCameraViewListener { private float mRelativeFaceSize = 0; private int mAbsoluteFaceSize = 0; - private OpenCvJavaCameraView mOpenCvCameraView; + private JavaCameraView mOpenCvCameraView; private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { @Override @@ -125,7 +125,7 @@ public class FdActivity extends Activity implements CvCameraViewListener { setContentView(R.layout.face_detect_surface_view); - mOpenCvCameraView = (OpenCvJavaCameraView)findViewById(R.id.fd_activity_surface_view); + mOpenCvCameraView = (JavaCameraView)findViewById(R.id.fd_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); } diff --git a/samples/android/image-manipulations/.classpath b/samples/android/image-manipulations/.classpath index a4763d1eec..3f9691c5dd 100644 --- a/samples/android/image-manipulations/.classpath +++ b/samples/android/image-manipulations/.classpath @@ -1,8 +1,8 @@ - - + + diff --git a/samples/android/image-manipulations/res/layout/image_manipulations_surface_view.xml b/samples/android/image-manipulations/res/layout/image_manipulations_surface_view.xml index 23016a1c0f..06e2e5e905 100644 --- a/samples/android/image-manipulations/res/layout/image_manipulations_surface_view.xml +++ b/samples/android/image-manipulations/res/layout/image_manipulations_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - 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 index 44a988ba67..293f8d8bf7 100644 --- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java +++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsActivity.java @@ -13,8 +13,8 @@ import org.opencv.core.MatOfInt; import org.opencv.core.Point; import org.opencv.core.Scalar; import org.opencv.core.Size; -import org.opencv.framework.OpenCvJavaCameraView; -import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener; +import org.opencv.android.JavaCameraView; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener; import org.opencv.imgproc.Imgproc; import android.app.Activity; @@ -45,7 +45,7 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView private MenuItem mItemPreviewZoom; private MenuItem mItemPreviewPixelize; private MenuItem mItemPreviewPosterize; - private OpenCvJavaCameraView mOpenCvCameraView; + private JavaCameraView mOpenCvCameraView; private Size mSize0; private Size mSizeRgba; @@ -106,7 +106,7 @@ public class ImageManipulationsActivity extends Activity implements CvCameraView setContentView(R.layout.image_manipulations_surface_view); - mOpenCvCameraView = (OpenCvJavaCameraView)findViewById(R.id.image_manipulations_activity_surface_view); + mOpenCvCameraView = (JavaCameraView)findViewById(R.id.image_manipulations_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); } diff --git a/samples/android/tutorial-0-androidcamera/.classpath b/samples/android/tutorial-0-androidcamera/.classpath index 6aed2ebfbe..d3bb07b44c 100644 --- a/samples/android/tutorial-0-androidcamera/.classpath +++ b/samples/android/tutorial-0-androidcamera/.classpath @@ -1,8 +1,8 @@ - - + + diff --git a/samples/android/tutorial-1-addopencv/.classpath b/samples/android/tutorial-1-addopencv/.classpath index a4763d1eec..3f9691c5dd 100644 --- a/samples/android/tutorial-1-addopencv/.classpath +++ b/samples/android/tutorial-1-addopencv/.classpath @@ -1,8 +1,8 @@ - - + + diff --git a/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml b/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml index 62a28ee101..52a73323ff 100644 --- a/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml +++ b/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - 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 f29c89c2a1..e53b55ce1c 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 @@ -4,8 +4,8 @@ import org.opencv.android.BaseLoaderCallback; import org.opencv.android.LoaderCallbackInterface; import org.opencv.android.OpenCVLoader; import org.opencv.core.Mat; -import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener; -import org.opencv.framework.OpenCvJavaCameraView; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener; +import org.opencv.android.JavaCameraView; import android.app.Activity; import android.os.Bundle; @@ -16,7 +16,7 @@ import android.view.WindowManager; public class Sample1Java extends Activity implements CvCameraViewListener { private static final String TAG = "OCVSample::Activity"; - private OpenCvJavaCameraView mOpenCvCameraView; + private JavaCameraView mOpenCvCameraView; private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { @Override @@ -49,7 +49,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener { setContentView(R.layout.tutorial1_surface_view); - mOpenCvCameraView = (OpenCvJavaCameraView)findViewById(R.id.tutorial1_activity_surface_view); + mOpenCvCameraView = (JavaCameraView)findViewById(R.id.tutorial1_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); } diff --git a/samples/android/tutorial-2-opencvcamera/.classpath b/samples/android/tutorial-2-opencvcamera/.classpath index a4763d1eec..3f9691c5dd 100644 --- a/samples/android/tutorial-2-opencvcamera/.classpath +++ b/samples/android/tutorial-2-opencvcamera/.classpath @@ -1,8 +1,8 @@ - - + + diff --git a/samples/android/tutorial-2-opencvcamera/res/layout/tutorial2_surface_view.xml b/samples/android/tutorial-2-opencvcamera/res/layout/tutorial2_surface_view.xml index b8871e037c..b8f760494e 100644 --- a/samples/android/tutorial-2-opencvcamera/res/layout/tutorial2_surface_view.xml +++ b/samples/android/tutorial-2-opencvcamera/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/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java index c23cc7dc6e..0676d5bb2d 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 @@ -8,8 +8,8 @@ import org.opencv.core.CvType; import org.opencv.core.Mat; import org.opencv.core.Point; import org.opencv.core.Scalar; -import org.opencv.framework.OpenCvJavaCameraView; -import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener; +import org.opencv.android.NativeCameraView; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener; import org.opencv.highgui.Highgui; import org.opencv.imgproc.Imgproc; @@ -35,7 +35,7 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene private Mat mRgba; private Mat mIntermediateMat; - private OpenCvJavaCameraView mOpenCvCameraView; + private NativeCameraView mOpenCvCameraView; private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { @Override @@ -68,7 +68,7 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene setContentView(R.layout.tutorial2_surface_view); - mOpenCvCameraView = (OpenCvJavaCameraView)findViewById(R.id.tutorial2_activity_surface_view); + mOpenCvCameraView = (NativeCameraView)findViewById(R.id.tutorial2_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); } diff --git a/samples/android/tutorial-3-native/.classpath b/samples/android/tutorial-3-native/.classpath index 6aed2ebfbe..d3bb07b44c 100644 --- a/samples/android/tutorial-3-native/.classpath +++ b/samples/android/tutorial-3-native/.classpath @@ -1,8 +1,8 @@ - - + + 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 index 0a4ac0ff44..71cd6e04cb 100644 --- a/samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml +++ b/samples/android/tutorial-3-native/res/layout/tutorial3_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - 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 index 67753d589c..9e17793d17 100644 --- 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 @@ -5,8 +5,8 @@ import org.opencv.android.LoaderCallbackInterface; import org.opencv.android.OpenCVLoader; import org.opencv.core.CvType; import org.opencv.core.Mat; -import org.opencv.framework.OpenCvJavaCameraView; -import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener; +import org.opencv.android.JavaCameraView; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener; import org.opencv.imgproc.Imgproc; import android.app.Activity; @@ -20,9 +20,9 @@ public class Sample3Native extends Activity implements CvCameraViewListener { private Mat mRgba; private Mat mGrayMat; - private OpenCvJavaCameraView mOpenCvCameraView; + private JavaCameraView mOpenCvCameraView; - private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { + private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { @Override public void onManagerConnected(int status) { switch (status) { @@ -57,7 +57,7 @@ public class Sample3Native extends Activity implements CvCameraViewListener { setContentView(R.layout.tutorial3_surface_view); - mOpenCvCameraView = (OpenCvJavaCameraView)findViewById(R.id.tutorial4_activity_surface_view); + mOpenCvCameraView = (JavaCameraView)findViewById(R.id.tutorial4_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); } diff --git a/samples/android/tutorial-4-mixed/.classpath b/samples/android/tutorial-4-mixed/.classpath index a4763d1eec..3f9691c5dd 100644 --- a/samples/android/tutorial-4-mixed/.classpath +++ b/samples/android/tutorial-4-mixed/.classpath @@ -1,8 +1,8 @@ - - + + 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 index 0a4ac0ff44..71cd6e04cb 100644 --- a/samples/android/tutorial-4-mixed/res/layout/tutorial4_surface_view.xml +++ b/samples/android/tutorial-4-mixed/res/layout/tutorial4_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - 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 21acd0c5fd..2a3eb99733 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 @@ -5,8 +5,8 @@ import org.opencv.android.LoaderCallbackInterface; import org.opencv.android.OpenCVLoader; import org.opencv.core.CvType; import org.opencv.core.Mat; -import org.opencv.framework.OpenCvJavaCameraView; -import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener; +import org.opencv.android.JavaCameraView; +import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener; import org.opencv.highgui.Highgui; import org.opencv.imgproc.Imgproc; @@ -36,7 +36,7 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener { private MenuItem mItemPreviewCanny; private MenuItem mItemPreviewFeatures; - private OpenCvJavaCameraView mOpenCvCameraView; + private JavaCameraView mOpenCvCameraView; private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) { @Override @@ -73,7 +73,7 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener { setContentView(R.layout.tutorial4_surface_view); - mOpenCvCameraView = (OpenCvJavaCameraView)findViewById(R.id.tutorial4_activity_surface_view); + mOpenCvCameraView = (JavaCameraView)findViewById(R.id.tutorial4_activity_surface_view); mOpenCvCameraView.setCvCameraViewListener(this); }