potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-06-11 15:16:34 +03:00
parent ef9b42c05a fcc76c120f
commit dd87ffc340
35 changed files with 773 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java
+4 -1
View File
@@ -96,8 +96,10 @@ public class JavaCamera2View extends CameraBridgeViewBase {
Log.e(LOGTAG, "Error: camera isn't detected.");
return false;
}
boolean chosen = false; // remember whether the camera ID is set.
if (mCameraIndex == CameraBridgeViewBase.CAMERA_ID_ANY) {
mCameraID = camList[0];
chosen = true;
} else {
for (String cameraID : camList) {
CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraID);
@@ -107,11 +109,12 @@ public class JavaCamera2View extends CameraBridgeViewBase {
characteristics.get(CameraCharacteristics.LENS_FACING) == CameraCharacteristics.LENS_FACING_FRONT)
) {
mCameraID = cameraID;
chosen = true;
break;
}
}
}
if (mCameraID == null) { // make JavaCamera2View behaves in the same way as JavaCameraView
if (mCameraID == null || !chosen) { // make JavaCamera2View behaves in the same way as JavaCameraView
Log.i(LOGTAG, "Selecting camera by index (" + mCameraIndex + ")");
if (mCameraIndex < camList.length) {
mCameraID = camList[mCameraIndex];