[opt] fix a native memory leak when repeat open close camera

jiangdongguo · Jul 15, 2022 · 22f117c · 22f117c
1 parent c8c944e
commit 22f117c
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -60,8 +60,8 @@ dependencies {
     implementation "com.tencent.bugly:nativecrashreport:$bugly_native_version"
 
     // For debug online
-//    implementation project(':libausbc')
+    implementation project(':libausbc')
 
     // demo
-    implementation 'com.github.jiangdongguo.AndroidUSBCamera:libausbc:3.1.7'
+//    implementation 'com.github.jiangdongguo.AndroidUSBCamera:libausbc:3.1.7'
 }
diff --git a/libuvc/src/main/jni/UVCCamera/UVCPreview.cpp b/libuvc/src/main/jni/UVCCamera/UVCPreview.cpp
@@ -721,6 +721,9 @@ void UVCPreview::addCaptureFrame(uvc_frame_t *frame) {
 		}
 		captureQueu = frame;
 		pthread_cond_broadcast(&capture_sync);
+	} else {
+		// Add this can solve native leak
+		recycle_frame(frame);
 	}
 	pthread_mutex_unlock(&capture_mutex);
 }

diff --git a/libuvc/src/main/libs/arm64-v8a/libUVCCamera.so b/libuvc/src/main/libs/arm64-v8a/libUVCCamera.so
diff --git a/libuvc/src/main/libs/arm64-v8a/libjpeg-turbo1500.so b/libuvc/src/main/libs/arm64-v8a/libjpeg-turbo1500.so
diff --git a/libuvc/src/main/libs/arm64-v8a/libusb100.so b/libuvc/src/main/libs/arm64-v8a/libusb100.so
diff --git a/libuvc/src/main/libs/arm64-v8a/libuvc.so b/libuvc/src/main/libs/arm64-v8a/libuvc.so
diff --git a/libuvc/src/main/libs/armeabi-v7a/libUVCCamera.so b/libuvc/src/main/libs/armeabi-v7a/libUVCCamera.so
diff --git a/libuvc/src/main/libs/armeabi-v7a/libjpeg-turbo1500.so b/libuvc/src/main/libs/armeabi-v7a/libjpeg-turbo1500.so
diff --git a/libuvc/src/main/libs/armeabi-v7a/libusb100.so b/libuvc/src/main/libs/armeabi-v7a/libusb100.so
diff --git a/libuvc/src/main/libs/armeabi-v7a/libuvc.so b/libuvc/src/main/libs/armeabi-v7a/libuvc.so
diff --git a/settings.gradle b/settings.gradle
@@ -1,8 +1,8 @@
 include ':app'
 
 // For debug online
-//include ':libausbc'
-//include ':libuvc'
-//include ':libpush'
-//include ':libnative'
-//include ':libuvccommon'
+include ':libausbc'
+include ':libuvc'
+include ':libpush'
+include ':libnative'
+include ':libuvccommon'