Merge pull request #12 from Uralstech/unstable

UXR.QuestCamera v3.1.3

Author: Uralstech

UCamera/UCamera/src/main/java/com/uralstech/ucamera/CaptureSessionWrapper.kt

@@ -250,20 +250,21 @@ abstract class CaptureSessionWrapper private constructor(private val callbacks:
     protected open fun closeWork() {
         if (captureSession != null) {
             captureSession?.stopRepeating()
+            captureSession?.close()
+            captureSession = null
+
+            Log.i(TAG, "Closing capture session.")
 
             try {
-                if (!requestCompletionLatch.await(1, TimeUnit.SECONDS)) {
+                if (!requestCompletionLatch.await(5, TimeUnit.SECONDS)) {
                     Log.w(TAG, "Could not wait for total request completion due to timeout.")
                 }
             } catch (e: InterruptedException) {
                 Log.e(TAG, "Interrupted while trying to stop captureSession", e)
             }
         }
 
-        captureSession?.close()
-        captureSession = null
-
-        if (executorSemaphore.tryAcquire(1, TimeUnit.SECONDS))
+        if (executorSemaphore.tryAcquire(5, TimeUnit.SECONDS))
         {
             captureSessionExecutor.shutdown()
             executorSemaphore.release()

UCamera/UCamera/src/main/java/com/uralstech/ucamera/STCaptureSessionWrapper.kt

@@ -237,19 +237,21 @@ class STCaptureSessionWrapper(
     private fun closeWork() {
         if (captureSession != null) {
             captureSession?.stopRepeating()
+            captureSession?.close()
+            captureSession = null
+
+            Log.i(TAG, "Closing capture session.")
+
             try {
-                if (!requestCompletionLatch.await(1, TimeUnit.SECONDS)) {
+                if (!requestCompletionLatch.await(5, TimeUnit.SECONDS)) {
                     Log.w(TAG, "Could not wait for total request completion due to timeout.")
                 }
             } catch (e: InterruptedException) {
                 Log.e(TAG, "Interrupted while trying to stop captureSession", e)
             }
         }
 
-        captureSession?.close()
-        captureSession = null
-
-        if (executorSemaphore.tryAcquire(1, TimeUnit.SECONDS)) {
+        if (executorSemaphore.tryAcquire(5, TimeUnit.SECONDS)) {
             captureSessionExecutor.shutdown()
             executorSemaphore.release()
         } else {

UCamera/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-agp = "8.10.0"
-camera2 = "1.5.1"
+agp = "8.10.1"
+camera2 = "1.5.2"
 kotlin = "2.2.21"
 coreKtx = "1.17.0"
 

UXR.QuestCamera/Packages/com.uralstech.uxr.questcamera/Editor/Dependencies/Dependencies.xml

@@ -1,5 +1,5 @@
 <dependencies>
     <androidPackages>
-        <androidPackage spec="androidx.camera:camera-camera2:1.5.1" />
+        <androidPackage spec="androidx.camera:camera-camera2:1.5.2" />
     </androidPackages>
 </dependencies>

UXR.QuestCamera/Packages/com.uralstech.uxr.questcamera/Runtime/Plugins/Android/com.uralstech.ucamera-release.aar

@@ -3,7 +3,7 @@
   "displayName": "UXR.QuestCamera",
   "description": "A Unity package to use the new Meta Quest Passthrough Camera API.",
   "keywords": [],
-  "version": "3.1.2",
+  "version": "3.1.3",
   "unity": "2022.3",
   "hideInEditor": false,
   "documentationUrl": "https://uralstech.github.io/UXR.QuestCamera/",

UXR.QuestCamera/Packages/com.uralstech.uxr.questcamera/package.json

@@ -20,7 +20,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.8.25",
+      "version": "1.8.26",
       "depth": 1,
       "source": "registry",
       "dependencies": {

UXR.QuestCamera/Packages/packages-lock.json

@@ -1,6 +1,6 @@
 <dependencies>
   <packages>
-    <package>androidx.camera:camera-camera2:1.5.1</package>
+    <package>androidx.camera:camera-camera2:1.5.2</package>
   </packages>
   <files />
   <settings>

UXR.QuestCamera/ProjectSettings/AndroidResolverDependencies.xml

@@ -9,9 +9,10 @@ EditorBuildSettings:
     path: Assets/test.unity
     guid: b5a0a63e0e2a441d9bece1500fac12ab
   - enabled: 0
-    path: Assets/Samples/UXR.QuestCamera/3.1.1/Digit Recognition with Unity Inference
+    path: Assets/Samples/UXR.QuestCamera/3.1.2/Digit Recognition with Unity Inference
       Engine/Scenes/Main.unity
     guid: d21f9028511979e4bbe9142830c1ea80
   m_configObjects:
+    com.unity.dt.app-ui: {fileID: 11400000, guid: 1b1c20d82303e4b5781c3ef50ac1449f, type: 2}
     com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 289c1b55c9541489481df5cc06664110, type: 3}
   m_UseUCBPForAssetBundles: 0

UXR.QuestCamera/ProjectSettings/EditorBuildSettings.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 15023, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEditor.MultiplayerModule.dll::UnityEditor.Multiplayer.Internal.MultiplayerRolesSettings
+  m_MultiplayerRoleForClassicProfile:
+    m_Keys: []
+    m_Values: