From 225bdc21c03dc98cc2e7c2ee0d130ff8c85e066f Mon Sep 17 00:00:00 2001 From: Jaewoo Song Date: Fri, 15 Feb 2019 17:10:38 +0800 Subject: [PATCH] Making JavaCamera2View behaves in the same way as JavaCameraView --- .../android-21/java/org/opencv/android/JavaCamera2View.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java b/modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java index 2cf512f..045917e 100644 --- a/modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java +++ b/modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java @@ -110,6 +110,15 @@ public class JavaCamera2View extends CameraBridgeViewBase { if (mCameraID != null) { Log.i(LOGTAG, "Opening camera: " + mCameraID); manager.openCamera(mCameraID, mStateCallback, mBackgroundHandler); + } else { // make JavaCamera2View behaves in the same way as JavaCameraView + Log.i(LOGTAG, "Trying to open camera with the value (" + mCameraIndex + ")"); + if (mCameraIndex < camList.length) { + mCameraID = camList[mCameraIndex]; + manager.openCamera(mCameraID, mStateCallback, mBackgroundHandler); + } else { + // CAMERA_DISCONNECTED is used when the camera id is no longer valid + throw new CameraAccessException(CameraAccessException.CAMERA_DISCONNECTED); + } } return true; } catch (CameraAccessException e) { -- 2.7.4