[opt] auto choose yuv or mjpeg frame format2

jiangdongguo · Jul 25, 2022 · 3099d11 · 3099d11
1 parent f9619d4
commit 3099d11
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 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.2.0'
+//    implementation 'com.github.jiangdongguo.AndroidUSBCamera:libausbc:3.2.0'
 }
diff --git a/libausbc/src/main/java/com/jiangdg/ausbc/MultiCameraClient.kt b/libausbc/src/main/java/com/jiangdg/ausbc/MultiCameraClient.kt
@@ -390,8 +390,8 @@ class MultiCameraClient(ctx: Context, callback: IDeviceConnectCallBack?) {
                 )
             } catch (e: Exception) {
                 try {
-                    val previewSize = getSuitableSize(request.previewWidth, request.previewHeight)
                     mPreviewFrameFormat = UVCCamera.FRAME_FORMAT_YUYV
+                    val previewSize = getSuitableSize(request.previewWidth, request.previewHeight)
                     if (! isPreviewSizeSupported(previewSize)) {
                         mMainHandler.post {
                             mCameraStateCallback?.onCameraState(

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'