Initialize RTC library only once (#508)

* Initialize RTC library only once * spotless and changeset
livekit · Sep 20, 2024 · 41e5aa6 · 41e5aa6
1 parent 619cd4c
commit 41e5aa6
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 26 deletions.
diff --git a/.changeset/chilled-cherries-teach.md b/.changeset/chilled-cherries-teach.md
@@ -0,0 +1,5 @@
+---
+"client-sdk-android": patch
+---
+
+Initialize WebRTC library only once
diff --git a/livekit-android-sdk/src/main/java/io/livekit/android/dagger/RTCModule.kt b/livekit-android-sdk/src/main/java/io/livekit/android/dagger/RTCModule.kt
@@ -63,6 +63,11 @@ typealias CapabilitiesGetter = @JvmSuppressWildcards (MediaStreamTrack.MediaType
 @Module
 internal object RTCModule {
 
+    /**
+     * To only be written to on the WebRTC thread.
+     */
+    private var hasInitializedWebrtc = false
+
     /**
      * Certain classes require libwebrtc to be initialized prior to use.
      *
@@ -86,32 +91,39 @@ internal object RTCModule {
     @Singleton
     @Named(InjectionNames.LIB_WEBRTC_INITIALIZATION)
     fun libWebrtcInitialization(appContext: Context): LibWebrtcInitialization {
-        PeerConnectionFactory.initialize(
-            PeerConnectionFactory.InitializationOptions
-                .builder(appContext)
-                .setNativeLibraryName("lkjingle_peerconnection_so")
-                .setInjectableLogger(
-                    { s, severity, s2 ->
-                        if (!LiveKit.enableWebRTCLogging) {
-                            return@setInjectableLogger
-                        }
-
-                        val loggingLevel = when (severity) {
-                            Logging.Severity.LS_VERBOSE -> LoggingLevel.VERBOSE
-                            Logging.Severity.LS_INFO -> LoggingLevel.INFO
-                            Logging.Severity.LS_WARNING -> LoggingLevel.WARN
-                            Logging.Severity.LS_ERROR -> LoggingLevel.ERROR
-                            else -> LoggingLevel.OFF
-                        }
-
-                        LKLog.log(loggingLevel) {
-                            Timber.log(loggingLevel.toAndroidLogPriority(), "$s2: $s")
-                        }
-                    },
-                    Logging.Severity.LS_VERBOSE,
-                )
-                .createInitializationOptions(),
-        )
+        if (!hasInitializedWebrtc) {
+            executeBlockingOnRTCThread {
+                if (!hasInitializedWebrtc) {
+                    hasInitializedWebrtc = true
+                    PeerConnectionFactory.initialize(
+                        PeerConnectionFactory.InitializationOptions
+                            .builder(appContext)
+                            .setNativeLibraryName("lkjingle_peerconnection_so")
+                            .setInjectableLogger(
+                                { s, severity, s2 ->
+                                    if (!LiveKit.enableWebRTCLogging) {
+                                        return@setInjectableLogger
+                                    }
+
+                                    val loggingLevel = when (severity) {
+                                        Logging.Severity.LS_VERBOSE -> LoggingLevel.VERBOSE
+                                        Logging.Severity.LS_INFO -> LoggingLevel.INFO
+                                        Logging.Severity.LS_WARNING -> LoggingLevel.WARN
+                                        Logging.Severity.LS_ERROR -> LoggingLevel.ERROR
+                                        else -> LoggingLevel.OFF
+                                    }
+
+                                    LKLog.log(loggingLevel) {
+                                        Timber.log(loggingLevel.toAndroidLogPriority(), "$s2: $s")
+                                    }
+                                },
+                                Logging.Severity.LS_VERBOSE,
+                            )
+                            .createInitializationOptions(),
+                    )
+                }
+            }
+        }
         return LibWebrtcInitialization
     }