Extract CameraXProvider and expose it

.changeset/strong-dogs-camp.md

@@ -0,0 +1,5 @@
+---
+"client-sdk-android": minor
+---
+
+Extract CameraXProvider and expose it.

livekit-android-camerax/src/main/java/livekit/org/webrtc/CameraXHelper.kt

@@ -16,16 +16,11 @@
 
 package livekit.org.webrtc
 
-import android.content.Context
 import android.hardware.camera2.CameraManager
 import androidx.camera.camera2.interop.ExperimentalCamera2Interop
 import androidx.camera.core.UseCase
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
-import io.livekit.android.room.track.LocalVideoTrackOptions
 import io.livekit.android.room.track.video.CameraCapturerUtils
-import io.livekit.android.room.track.video.CameraCapturerUtils.findCamera
-import io.livekit.android.room.track.video.CameraEventsDispatchHandler
 
 class CameraXHelper {
     companion object {
@@ -44,41 +39,9 @@ class CameraXHelper {
         fun createCameraProvider(
             lifecycleOwner: LifecycleOwner,
             useCases: Array<out UseCase> = emptyArray(),
-        ) = object : CameraCapturerUtils.CameraProvider {
-
-            private var enumerator: CameraXEnumerator? = null
-
-            override val cameraVersion = 3
-
-            override fun provideEnumerator(context: Context): CameraXEnumerator =
-                enumerator ?: CameraXEnumerator(context, lifecycleOwner, useCases).also {
-                    enumerator = it
-                }
-
-            override fun provideCapturer(
-                context: Context,
-                options: LocalVideoTrackOptions,
-                eventsHandler: CameraEventsDispatchHandler,
-            ): VideoCapturer {
-                val enumerator = provideEnumerator(context)
-                val cameraManager = context.getSystemService(Context.CAMERA_SERVICE) as CameraManager
-
-                val targetDevice = enumerator.findCamera(options.deviceId, options.position)
-                val targetDeviceId = targetDevice?.deviceId
-
-                val targetVideoCapturer = enumerator.createCapturer(targetDeviceId, eventsHandler) as CameraXCapturer
-
-                return CameraXCapturerWithSize(
-                    targetVideoCapturer,
-                    cameraManager,
-                    targetDeviceId,
-                    eventsHandler,
-                )
-            }
-
-            override fun isSupported(context: Context): Boolean {
-                return Camera2Enumerator.isSupported(context) && lifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.INITIALIZED)
-            }
+            cameraVersion: Int = 3,
+        ): CameraXProvider {
+            return CameraXProvider(lifecycleOwner, useCases, cameraVersion)
         }
 
         private fun getSupportedFormats(

livekit-android-camerax/src/main/java/livekit/org/webrtc/CameraXProvider.kt

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2025 LiveKit, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package livekit.org.webrtc
+
+import android.content.Context
+import android.hardware.camera2.CameraManager
+import androidx.camera.camera2.interop.ExperimentalCamera2Interop
+import androidx.camera.core.UseCase
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import io.livekit.android.room.track.LocalVideoTrackOptions
+import io.livekit.android.room.track.video.CameraCapturerUtils
+import io.livekit.android.room.track.video.CameraCapturerUtils.findCamera
+import io.livekit.android.room.track.video.CameraEventsDispatchHandler
+
+@ExperimentalCamera2Interop
+class CameraXProvider(
+    val lifecycleOwner: LifecycleOwner,
+    val useCases: Array<out UseCase> = emptyArray(),
+    override val cameraVersion: Int = 3,
+) : CameraCapturerUtils.CameraProvider {
+
+    var enumerator: CameraXEnumerator? = null
+        private set
+
+    override fun provideEnumerator(context: Context): CameraXEnumerator = enumerator ?: CameraXEnumerator(context, lifecycleOwner, useCases).also {
+        enumerator = it
+    }
+
+    override fun provideCapturer(
+        context: Context,
+        options: LocalVideoTrackOptions,
+        eventsHandler: CameraEventsDispatchHandler,
+    ): VideoCapturer {
+        val enumerator = provideEnumerator(context)
+        val cameraManager = context.getSystemService(Context.CAMERA_SERVICE) as CameraManager
+
+        val targetDevice = enumerator.findCamera(options.deviceId, options.position)
+        val targetDeviceId = targetDevice?.deviceId
+
+        val targetVideoCapturer = enumerator.createCapturer(targetDeviceId, eventsHandler) as CameraXCapturer
+
+        return CameraXCapturerWithSize(
+            targetVideoCapturer,
+            cameraManager,
+            targetDeviceId,
+            eventsHandler,
+        )
+    }
+
+    override fun isSupported(context: Context): Boolean {
+        return Camera2Enumerator.isSupported(context) && lifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.INITIALIZED)
+    }
+}

livekit-android-sdk/src/main/java/io/livekit/android/room/track/video/CameraCapturerUtils.kt

@@ -69,7 +69,7 @@ object CameraCapturerUtils {
      *
      * Picks CameraProvider of highest available version that is supported on device
      */
-    private fun getCameraProvider(context: Context): CameraProvider {
+    fun getCameraProvider(context: Context): CameraProvider {
         return cameraProviders
             .sortedByDescending { it.cameraVersion }
             .first { it.isSupported(context) }