Some unification done to simplify camera switching.
private Object mSyncObject = new Object();
public void surfaceChanged(SurfaceHolder arg0, int arg1, int arg2, int arg3) {
+ Log.d(TAG, "call surfaceChanged event");
synchronized(mSyncObject) {
if (!mSurfaceExist) {
mSurfaceExist = true;
private void checkCurrentState() {
int targetState;
- if (mEnabled && mSurfaceExist) {
+ if (mEnabled && mSurfaceExist && getVisibility() == VISIBLE) {
targetState = STARTED;
} else {
targetState = STOPPED;
import org.opencv.android.LoaderCallbackInterface;
import org.opencv.android.OpenCVLoader;
import org.opencv.core.Mat;
+import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
-import org.opencv.android.JavaCameraView;
import android.os.Bundle;
import android.app.Activity;
public class Puzzle15Activity extends Activity implements CvCameraViewListener, View.OnTouchListener {
- private static final String TAG = "Sample::Puzzle15::Activity";
+ private static final String TAG = "Sample::Puzzle15::Activity";
- private JavaCameraView mOpenCvCameraView;
- private Puzzle15Processor mPuzzle15;
+ private CameraBridgeViewBase mOpenCvCameraView;
+ private Puzzle15Processor mPuzzle15;
- private int mGameWidth;
- private int mGameHeight;
+ private int mGameWidth;
+ private int mGameHeight;
private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
setContentView(R.layout.activity_puzzle15);
- mOpenCvCameraView = (JavaCameraView) findViewById(R.id.puzzle_activity_surface_view);
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.puzzle_activity_surface_view);
mOpenCvCameraView.setCvCameraViewListener(this);
mPuzzle15 = new Puzzle15Processor();
mPuzzle15.prepareNewGame();
import org.opencv.core.Rect;
import org.opencv.core.Scalar;
import org.opencv.core.Size;
+import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
-import org.opencv.android.JavaCameraView;
import org.opencv.imgproc.Imgproc;
import android.app.Activity;
import android.view.View.OnTouchListener;
public class ColorBlobDetectionActivity extends Activity implements OnTouchListener, CvCameraViewListener {
- private static final String TAG = "OCVSample::Activity";
+ private static final String TAG = "OCVSample::Activity";
- private boolean mIsColorSelected = false;
+ private boolean mIsColorSelected = false;
private Mat mRgba;
private Scalar mBlobColorRgba;
private Scalar mBlobColorHsv;
private Size SPECTRUM_SIZE;
private Scalar CONTOUR_COLOR;
- private JavaCameraView mOpenCvCameraView;
+ private CameraBridgeViewBase mOpenCvCameraView;
private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
@Override
setContentView(R.layout.color_blob_detection_surface_view);
- mOpenCvCameraView = (JavaCameraView)findViewById(R.id.color_blob_detection_activity_surface_view);
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.color_blob_detection_activity_surface_view);
mOpenCvCameraView.setCvCameraViewListener(this);
}
import org.opencv.core.Rect;
import org.opencv.core.Scalar;
import org.opencv.core.Size;
-import org.opencv.android.JavaCameraView;
+import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
import org.opencv.imgproc.Imgproc;
import org.opencv.objdetect.CascadeClassifier;
private float mRelativeFaceSize = 0;
private int mAbsoluteFaceSize = 0;
- private JavaCameraView mOpenCvCameraView;
+ private CameraBridgeViewBase mOpenCvCameraView;
private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
@Override
setContentView(R.layout.face_detect_surface_view);
- mOpenCvCameraView = (JavaCameraView)findViewById(R.id.fd_activity_surface_view);
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.fd_activity_surface_view);
mOpenCvCameraView.setCvCameraViewListener(this);
}
import org.opencv.core.Point;
import org.opencv.core.Scalar;
import org.opencv.core.Size;
-import org.opencv.android.JavaCameraView;
+import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
import org.opencv.imgproc.Imgproc;
private MenuItem mItemPreviewZoom;
private MenuItem mItemPreviewPixelize;
private MenuItem mItemPreviewPosterize;
- private JavaCameraView mOpenCvCameraView;
+ private CameraBridgeViewBase mOpenCvCameraView;
private Size mSize0;
private Size mSizeRgba;
setContentView(R.layout.image_manipulations_surface_view);
- mOpenCvCameraView = (JavaCameraView)findViewById(R.id.image_manipulations_activity_surface_view);
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.image_manipulations_activity_surface_view);
mOpenCvCameraView.setCvCameraViewListener(this);
}
<org.opencv.android.JavaCameraView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:id="@+id/tutorial1_activity_surface_view" />
+ android:visibility="gone"
+ android:id="@+id/tutorial1_activity_java_surface_view" />
+
+ <org.opencv.android.NativeCameraView
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:visibility="gone"
+ android:id="@+id/tutorial1_activity_native_surface_view" />
</LinearLayout>
import org.opencv.android.LoaderCallbackInterface;
import org.opencv.android.OpenCVLoader;
import org.opencv.core.Mat;
+import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
-import org.opencv.android.JavaCameraView;
import android.app.Activity;
import android.os.Bundle;
import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.SurfaceView;
import android.view.Window;
import android.view.WindowManager;
+import android.widget.Toast;
public class Sample1Java extends Activity implements CvCameraViewListener {
private static final String TAG = "OCVSample::Activity";
- private JavaCameraView mOpenCvCameraView;
+ private CameraBridgeViewBase mOpenCvCameraView;
+ private boolean mIsJavaCamera = true;
+ private MenuItem mItemSwitchCamera = null;
private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
@Override
setContentView(R.layout.tutorial1_surface_view);
- mOpenCvCameraView = (JavaCameraView)findViewById(R.id.tutorial1_activity_surface_view);
+ if (mIsJavaCamera)
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial1_activity_java_surface_view);
+ else
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial1_activity_native_surface_view);
+
+ mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE);
+
mOpenCvCameraView.setCvCameraViewListener(this);
}
mOpenCvCameraView.disableView();
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ Log.i(TAG, "called onCreateOptionsMenu");
+ mItemSwitchCamera = menu.add("Switch camera");
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ String toastMesage = new String();
+ Log.i(TAG, "called onOptionsItemSelected; selected item: " + item);
+
+ if (item == mItemSwitchCamera) {
+ mOpenCvCameraView.setVisibility(SurfaceView.GONE);
+ mIsJavaCamera = !mIsJavaCamera;
+
+ if (mIsJavaCamera) {
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial1_activity_java_surface_view);
+ toastMesage = "Java Camera";
+ } else {
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial1_activity_native_surface_view);
+ toastMesage = "Native Camera";
+ }
+
+ mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE);
+ mOpenCvCameraView.setCvCameraViewListener(this);
+ mOpenCvCameraView.enableView();
+ Toast toast = Toast.makeText(this, toastMesage, Toast.LENGTH_LONG);
+ toast.show();
+ }
+
+ return true;
+ }
+
public void onCameraViewStarted(int width, int height) {
}
import org.opencv.core.Mat;
import org.opencv.core.Point;
import org.opencv.core.Scalar;
-import org.opencv.android.NativeCameraView;
+import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
import org.opencv.highgui.Highgui;
import org.opencv.imgproc.Imgproc;
import android.view.WindowManager;
public class Sample2NativeCamera extends Activity implements CvCameraViewListener {
- private static final String TAG = "OCVSample::Activity";
+ 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;
+ 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 MenuItem mItemPreviewRGBA;
+ private MenuItem mItemPreviewGray;
+ private MenuItem mItemPreviewCanny;
+ private Mat mRgba;
+ private Mat mIntermediateMat;
- private NativeCameraView mOpenCvCameraView;
+ private CameraBridgeViewBase mOpenCvCameraView;
private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
@Override
setContentView(R.layout.tutorial2_surface_view);
- mOpenCvCameraView = (NativeCameraView)findViewById(R.id.tutorial2_activity_surface_view);
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial2_activity_surface_view);
mOpenCvCameraView.setCvCameraViewListener(this);
}
import org.opencv.android.OpenCVLoader;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
-import org.opencv.android.JavaCameraView;
+import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
import org.opencv.imgproc.Imgproc;
private Mat mRgba;
private Mat mGrayMat;
- private JavaCameraView mOpenCvCameraView;
+ private CameraBridgeViewBase mOpenCvCameraView;
private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
@Override
setContentView(R.layout.tutorial3_surface_view);
- mOpenCvCameraView = (JavaCameraView)findViewById(R.id.tutorial4_activity_surface_view);
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial4_activity_surface_view);
mOpenCvCameraView.setCvCameraViewListener(this);
}
import org.opencv.android.OpenCVLoader;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
-import org.opencv.android.JavaCameraView;
+import org.opencv.android.CameraBridgeViewBase;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
import org.opencv.highgui.Highgui;
import org.opencv.imgproc.Imgproc;
import android.view.WindowManager;
public class Sample4Mixed extends Activity implements CvCameraViewListener {
- private static final String TAG = "OCVSample::Activity";
+ private static final String TAG = "OCVSample::Activity";
private static final int VIEW_MODE_RGBA = 0;
private static final int VIEW_MODE_GRAY = 1;
private MenuItem mItemPreviewCanny;
private MenuItem mItemPreviewFeatures;
- private JavaCameraView mOpenCvCameraView;
+ private CameraBridgeViewBase mOpenCvCameraView;
private BaseLoaderCallback mLoaderCallback = new BaseLoaderCallback(this) {
@Override
setContentView(R.layout.tutorial4_surface_view);
- mOpenCvCameraView = (JavaCameraView)findViewById(R.id.tutorial4_activity_surface_view);
+ mOpenCvCameraView = (CameraBridgeViewBase) findViewById(R.id.tutorial4_activity_surface_view);
mOpenCvCameraView.setCvCameraViewListener(this);
}