Merge branch 'main' into dl/audio_stuff

Author: davidliu

.github/banner_dark.png

@@ -416,9 +416,10 @@ Apache License 2.0
 <br/><table>
 <thead><tr><th colspan="2">LiveKit Ecosystem</th></tr></thead>
 <tbody>
-<tr><td>Realtime SDKs</td><td><a href="https://github.com/livekit/components-js">React Components</a> · <a href="https://github.com/livekit/client-sdk-js">Browser</a> · <a href="https://github.com/livekit/components-swift">Swift Components</a> · <a href="https://github.com/livekit/client-sdk-swift">iOS/macOS/visionOS</a> · <a href="https://github.com/livekit/client-sdk-android">Android</a> · <a href="https://github.com/livekit/client-sdk-flutter">Flutter</a> · <b>React Native</b> · <a href="https://github.com/livekit/rust-sdks">Rust</a> · <a href="https://github.com/livekit/node-sdks">Node.js</a> · <a href="https://github.com/livekit/python-sdks">Python</a> · <a href="https://github.com/livekit/client-sdk-unity-web">Unity (web)</a> · <a href="https://github.com/livekit/client-sdk-unity">Unity (beta)</a></td></tr><tr></tr>
-<tr><td>Server APIs</td><td><a href="https://github.com/livekit/node-sdks">Node.js</a> · <a href="https://github.com/livekit/server-sdk-go">Golang</a> · <a href="https://github.com/livekit/server-sdk-ruby">Ruby</a> · <a href="https://github.com/livekit/server-sdk-kotlin">Java/Kotlin</a> · <a href="https://github.com/livekit/python-sdks">Python</a> · <a href="https://github.com/livekit/rust-sdks">Rust</a> · <a href="https://github.com/agence104/livekit-server-sdk-php">PHP (community)</a></td></tr><tr></tr>
-<tr><td>Agents Frameworks</td><td><a href="https://github.com/livekit/agents">Python</a> · <a href="https://github.com/livekit/agent-playground">Playground</a></td></tr><tr></tr>
+<tr><td>LiveKit SDKs</td><td><a href="https://github.com/livekit/client-sdk-js">Browser</a> · <a href="https://github.com/livekit/client-sdk-swift">iOS/macOS/visionOS</a> · <a href="https://github.com/livekit/client-sdk-android">Android</a> · <a href="https://github.com/livekit/client-sdk-flutter">Flutter</a> · <b>React Native</b> · <a href="https://github.com/livekit/rust-sdks">Rust</a> · <a href="https://github.com/livekit/node-sdks">Node.js</a> · <a href="https://github.com/livekit/python-sdks">Python</a> · <a href="https://github.com/livekit/client-sdk-unity">Unity</a> · <a href="https://github.com/livekit/client-sdk-unity-web">Unity (WebGL)</a></td></tr><tr></tr>
+<tr><td>Server APIs</td><td><a href="https://github.com/livekit/node-sdks">Node.js</a> · <a href="https://github.com/livekit/server-sdk-go">Golang</a> · <a href="https://github.com/livekit/server-sdk-ruby">Ruby</a> · <a href="https://github.com/livekit/server-sdk-kotlin">Java/Kotlin</a> · <a href="https://github.com/livekit/python-sdks">Python</a> · <a href="https://github.com/livekit/rust-sdks">Rust</a> · <a href="https://github.com/agence104/livekit-server-sdk-php">PHP (community)</a> · <a href="https://github.com/pabloFuente/livekit-server-sdk-dotnet">.NET (community)</a></td></tr><tr></tr>
+<tr><td>UI Components</td><td><a href="https://github.com/livekit/components-js">React</a> · <a href="https://github.com/livekit/components-android">Android Compose</a> · <a href="https://github.com/livekit/components-swift">SwiftUI</a></td></tr><tr></tr>
+<tr><td>Agents Frameworks</td><td><a href="https://github.com/livekit/agents">Python</a> · <a href="https://github.com/livekit/agents-js">Node.js</a> · <a href="https://github.com/livekit/agent-playground">Playground</a></td></tr><tr></tr>
 <tr><td>Services</td><td><a href="https://github.com/livekit/livekit">LiveKit server</a> · <a href="https://github.com/livekit/egress">Egress</a> · <a href="https://github.com/livekit/ingress">Ingress</a> · <a href="https://github.com/livekit/sip">SIP</a></td></tr><tr></tr>
 <tr><td>Resources</td><td><a href="https://docs.livekit.io">Docs</a> · <a href="https://github.com/livekit-examples">Example apps</a> · <a href="https://livekit.io/cloud">Cloud</a> · <a href="https://docs.livekit.io/home/self-hosting/deployment">Self-hosting</a> · <a href="https://github.com/livekit/livekit-cli">CLI</a></td></tr>
 </tbody>

.github/banner_light.png

@@ -16,14 +16,16 @@ import java.util.concurrent.Callable
 
 object LiveKitReactNative {
 
+
+    private var audioType: AudioType = AudioType.CommunicationAudioType()
+
     @SuppressLint("StaticFieldLeak")
-    private lateinit var adm: JavaAudioDeviceModule
+    private var adm: JavaAudioDeviceModule? = null
 
     val audioDeviceModule: JavaAudioDeviceModule
         get() {
-            if (!::adm.isInitialized) {
-                throw IllegalStateException("Audio device module is not initialized! Did you remember to call LiveKitReactNative.setup in your Application.onCreate?")
-            }
+            val adm = this.adm
+                ?: throw IllegalStateException("Audio device module is not initialized! Did you remember to call LiveKitReactNative.setup in your Application.onCreate?")
             return adm
         }
 
@@ -63,11 +65,17 @@ object LiveKitReactNative {
     ) {
         _audioRecordSamplesDispatcher = AudioRecordSamplesDispatcher()
 
+        this.audioType = audioType
         val options = WebRTCModuleOptions.getInstance()
         options.videoEncoderFactory = CustomVideoEncoderFactory(null, true, true)
         options.videoDecoderFactory = CustomVideoDecoderFactory()
         options.enableMediaProjectionService = true
 
+        setupAdm(context)
+        options.audioDeviceModule = adm
+    }
+
+    private fun setupAdm(context: Context) {
         val useHardwareAudioProcessing = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
 
         adm = JavaAudioDeviceModule.builder(context)
@@ -76,7 +84,17 @@ object LiveKitReactNative {
             .setAudioAttributes(audioType.audioAttributes)
             .setSamplesReadyCallback(audioRecordSamplesDispatcher)
             .createAudioDeviceModule()
+    }
+
+    internal fun invalidate(context: Context) {
+        val options = WebRTCModuleOptions.getInstance()
+        if (options.audioDeviceModule == adm) {
+            options.audioDeviceModule = null
+        }
+        adm?.release()
+        adm = null
 
+        setupAdm(context)
         options.audioDeviceModule = adm
 
         // CustomAudioProcessingController can't be instantiated before WebRTC is loaded.

README.md

@@ -193,4 +193,8 @@ class LivekitReactNativeModule(reactContext: ReactApplicationContext) : ReactCon
     fun removeListeners(count: Int?) {
         // Keep: Required for RN built in Event Emitter Calls.
     }
+
+    override fun invalidate() {
+        LiveKitReactNative.invalidate(reactApplicationContext)
+    }
 }