mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-01 18:37:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

android(camera2): apply .disconnectCamera() patch from issue 13574

Browse Source
This commit is contained in:
Alexander Alekhin 2019-12-19 00:29:53 +00:00
parent 5d15c65e48
commit 9cd1d087c3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/java/generator/android-21/java/org/opencv/android/JavaCamera2View.java
View File

@ -230,7 +230,7 @@ public class JavaCamera2View extends CameraBridgeViewBase {
@Override @Override
protected void disconnectCamera() { protected void disconnectCamera() {
Log.i(LOGTAG, "closeCamera"); Log.i(LOGTAG, "close camera");
try { try {
CameraDevice c = mCameraDevice; CameraDevice c = mCameraDevice;
mCameraDevice = null; mCameraDevice = null;
@ -241,13 +241,14 @@ public class JavaCamera2View extends CameraBridgeViewBase {
if (null != c) { if (null != c) {
c.close(); c.close();
} }
} finally {
stopBackgroundThread();
if (null != mImageReader) { if (null != mImageReader) {
mImageReader.close(); mImageReader.close();
mImageReader = null; mImageReader = null;
} }
} finally {
stopBackgroundThread();
} }
Log.i(LOGTAG, "camera closed!");
} }
public static class JavaCameraSizeAccessor implements ListItemAccessor { public static class JavaCameraSizeAccessor implements ListItemAccessor {