refactor(core): camera: pass the camera characteristics to the camera controller

Author: ThibaultBee

core/src/main/java/io/github/thibaultbee/streampack/core/elements/sources/video/camera/CameraSource.kt

@@ -57,15 +57,18 @@ internal class CameraSource(
 ) : ICameraSourceInternal, ICameraSource, AbstractPreviewableSource() {
     private val coroutineScope = CoroutineScope(dispatcherProvider.default)
 
+    private val characteristics = manager.getCameraCharacteristics(cameraId)
+
     private val controller = CameraController(
-        manager, dispatcherProvider, cameraId,
+        manager,
+        characteristics,
+        dispatcherProvider,
+        cameraId,
         captureRequestBuilder = {
             defaultCaptureRequest(this)
         }
     )
 
-    private val characteristics = manager.getCameraCharacteristics(cameraId)
-
     override val settings by lazy {
         CameraSettings(
             coroutineScope,

core/src/main/java/io/github/thibaultbee/streampack/core/elements/sources/video/camera/controllers/CameraController.kt

@@ -17,6 +17,7 @@ package io.github.thibaultbee.streampack.core.elements.sources.video.camera.cont
 
 import android.Manifest
 import android.hardware.camera2.CameraCaptureSession
+import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CameraManager
 import android.hardware.camera2.CaptureFailure
 import android.hardware.camera2.CaptureRequest
@@ -43,6 +44,7 @@ import kotlinx.coroutines.sync.withLock
  */
 internal class CameraController(
     private val manager: CameraManager,
+    private val characteristics: CameraCharacteristics,
     dispatcherProvider: CameraDispatcherProvider,
     val cameraId: String,
     val captureRequestBuilder: CaptureRequestWithTargetsBuilder.() -> Unit = {}
@@ -64,7 +66,7 @@ internal class CameraController(
     val isActiveFlow = _isActiveFlow.asStateFlow()
 
     private val fpsRange: Range<Int>
-        get() = CameraUtils.getClosestFpsRange(manager, cameraId, fps)
+        get() = CameraUtils.getClosestFpsRange(characteristics, fps)
     private var fps: Int = 30
     private var dynamicRangeProfile: DynamicRangeProfile = DynamicRangeProfile.sdr
 
@@ -308,18 +310,6 @@ internal class CameraController(
         }
     }
 
-    /**
-     * A default capture callback that logs the failure reason.
-     */
-    private val captureCallback = object : CameraCaptureSession.CaptureCallback() {
-        override fun onCaptureFailed(
-            session: CameraCaptureSession, request: CaptureRequest, failure: CaptureFailure
-        ) {
-            super.onCaptureFailed(session, request, failure)
-            Logger.e(TAG, "Capture failed with code ${failure.reason}")
-        }
-    }
-
     /**
      * Gets a setting from the current capture request.
      */

core/src/main/java/io/github/thibaultbee/streampack/core/elements/sources/video/camera/utils/CameraUtils.kt

@@ -17,6 +17,7 @@ package io.github.thibaultbee.streampack.core.elements.sources.video.camera.util
 
 import android.Manifest
 import android.hardware.camera2.CameraCaptureSession
+import android.hardware.camera2.CameraCharacteristics
 import android.hardware.camera2.CameraDevice
 import android.hardware.camera2.CameraManager
 import android.hardware.camera2.params.OutputConfiguration
@@ -152,11 +153,10 @@ internal object CameraUtils {
     }
 
     internal fun getClosestFpsRange(
-        cameraManager: CameraManager,
-        cameraId: String,
+        characteristics: CameraCharacteristics,
         fps: Int
     ): Range<Int> {
-        var fpsRangeList = cameraManager.getCameraCharacteristics(cameraId).targetFps
+        var fpsRangeList = characteristics.targetFps
         Logger.i(TAG, "Supported FPS range list: $fpsRangeList")
 
         // Get range that contains FPS