Potential fix for camera1 crash when getting dimensions after capture has started

@@ -209,6 +209,8 @@ constructor(
                 position = enumerator.getCameraPosition(targetDeviceName!!)
                 position = enumerator.getCameraPosition(targetDeviceName!!)
             )
             )
             if (targetVideoCapturer is Camera1Capturer) {
             if (targetVideoCapturer is Camera1Capturer) {
+                // Cache supported capture formats ahead of time to avoid future camera locks.
+                Camera1Helper.getSupportedFormats(Camera1Helper.getCameraId(newOptions.deviceId))
                 return Pair(
                 return Pair(
                     Camera1CapturerWithSize(targetVideoCapturer, targetDeviceName),
                     Camera1CapturerWithSize(targetVideoCapturer, targetDeviceName),
                     newOptions
                     newOptions

@@ -10,13 +10,16 @@ internal class Camera1Helper {
     companion object {
     companion object {
         fun getCameraId(deviceName: String?) = Camera1Enumerator.getCameraIndex(deviceName)
         fun getCameraId(deviceName: String?) = Camera1Enumerator.getCameraIndex(deviceName)
 
 
+        fun getSupportedFormats(cameraId: Int): List<CameraEnumerationAndroid.CaptureFormat> =
+            Camera1Enumerator.getSupportedFormats(cameraId)
+
         fun findClosestCaptureFormat(
         fun findClosestCaptureFormat(
             cameraId: Int,
             cameraId: Int,
             width: Int,
             width: Int,
             height: Int
             height: Int
         ): Size {
         ): Size {
             return CameraEnumerationAndroid.getClosestSupportedSize(
             return CameraEnumerationAndroid.getClosestSupportedSize(
-                Camera1Enumerator.getSupportedFormats(cameraId)
+                getSupportedFormats(cameraId)
                     .map { Size(it.width, it.height) },
                     .map { Size(it.width, it.height) },
                 width,
                 width,
                 height
                 height

@@ -11,13 +11,20 @@ import android.hardware.camera2.CameraManager
  */
  */
 internal class Camera2Helper {
 internal class Camera2Helper {
     companion object {
     companion object {
+
+        fun getSupportedFormats(
+            cameraManager: CameraManager,
+            cameraId: String?,
+        ): List<CameraEnumerationAndroid.CaptureFormat>? =
+            Camera2Enumerator.getSupportedFormats(cameraManager, cameraId)
+
         fun findClosestCaptureFormat(
         fun findClosestCaptureFormat(
             cameraManager: CameraManager,
             cameraManager: CameraManager,
             cameraId: String?,
             cameraId: String?,
             width: Int,
             width: Int,
             height: Int
             height: Int
         ): Size {
         ): Size {
-            val sizes = Camera2Enumerator.getSupportedFormats(cameraManager, cameraId)
+            val sizes = getSupportedFormats(cameraManager, cameraId)
                 ?.map { Size(it.width, it.height) }
                 ?.map { Size(it.width, it.height) }
                 ?: emptyList()
                 ?: emptyList()
             return CameraEnumerationAndroid.getClosestSupportedSize(sizes, width, height)
             return CameraEnumerationAndroid.getClosestSupportedSize(sizes, width, height)