Merge branch 'main' into dl/android_bluetooth_sco

android/build.gradle

@@ -130,7 +130,7 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   api 'com.github.davidliu:audioswitch:89582c47c9a04c62f90aa5e57251af4800a62c9a'
-  api 'io.github.webrtc-sdk:android:104.5112.10'
+  api 'io.github.webrtc-sdk:android:114.5735.05'
   implementation project(':livekit_react-native-webrtc')
   implementation "androidx.annotation:annotation:1.4.0"
 }

android/src/main/java/com/livekit/reactnative/video/SimulcastVideoEncoderFactoryWrapper.kt

@@ -1,6 +1,7 @@
 package com.livekit.reactnative.video
 
 import android.util.Log
+import com.oney.WebRTCModule.webrtcutils.SoftwareVideoEncoderFactoryProxy
 import org.webrtc.EglBase
 import org.webrtc.HardwareVideoEncoderFactory
 import org.webrtc.SimulcastVideoEncoderFactory
@@ -64,7 +65,7 @@ open class SimulcastVideoEncoderFactoryWrapper(
     private class FallbackFactory(private val hardwareVideoEncoderFactory: VideoEncoderFactory) :
         VideoEncoderFactory {
 
-        private val softwareVideoEncoderFactory: VideoEncoderFactory = SoftwareVideoEncoderFactory()
+        private val softwareVideoEncoderFactory: VideoEncoderFactory = SoftwareVideoEncoderFactoryProxy()
 
         override fun createEncoder(info: VideoCodecInfo): VideoEncoder? {
             val softwareEncoder = softwareVideoEncoderFactory.createEncoder(info)

docs/functions/VideoView.html

@@ -24,7 +24,7 @@ <h4 class="tsd-parameters-title">Parameters</h4>
 <h5>__namedParameters: <a href="../types/Props.html" class="tsd-signature-type" data-tsd-kind="Type alias">Props</a></h5></li></ul></div>
 <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Element</span></h4><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/livekit/client-sdk-react-native/blob/32cf80b/src/components/VideoView.tsx#L24">components/VideoView.tsx:24</a></li></ul></aside></li></ul></section></div>
+<li>Defined in <a href="https://github.com/livekit/client-sdk-react-native/blob/6720080/src/components/VideoView.tsx#L24">components/VideoView.tsx:24</a></li></ul></aside></li></ul></section></div>
 <div class="col-4 col-menu menu-sticky-wrap menu-highlight">
 <div class="tsd-navigation settings">
 <details class="tsd-index-accordion"><summary class="tsd-accordion-summary">
@@ -53,12 +53,23 @@ <h3><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><path d="M4.9389
 <li class="tsd-kind-interface"><a href="../interfaces/RoomOptions.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-256-path"></use><use href="#icon-256-text"></use></svg>Room<wbr/>Options</a></li>
 <li class="tsd-kind-interface"><a href="../interfaces/RoomState.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-256-path"></use><use href="#icon-256-text"></use></svg>Room<wbr/>State</a></li>
 <li class="tsd-kind-type-alias"><a href="../types/AndroidAudioTypeOptions.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><rect fill="var(--color-icon-background)" stroke="var(--color-ts)" stroke-width="1.5" x="1" y="1" width="22" height="22" rx="6" id="icon-4194304-path"></rect><path d="M11.31 16V8.224H8.91V7.24H14.79V8.224H12.39V16H11.31Z" fill="var(--color-text)" id="icon-4194304-text"></path></svg>Android<wbr/>Audio<wbr/>Type<wbr/>Options</a></li>
+<li class="tsd-kind-type-alias"><a href="../types/AppleAudioCategory.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Apple<wbr/>Audio<wbr/>Category</a></li>
+<li class="tsd-kind-type-alias"><a href="../types/AppleAudioCategoryOption.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Apple<wbr/>Audio<wbr/>Category<wbr/>Option</a></li>
+<li class="tsd-kind-type-alias"><a href="../types/AppleAudioConfiguration.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Apple<wbr/>Audio<wbr/>Configuration</a></li>
+<li class="tsd-kind-type-alias"><a href="../types/AppleAudioMode.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Apple<wbr/>Audio<wbr/>Mode</a></li>
 <li class="tsd-kind-type-alias"><a href="../types/AudioConfiguration.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Audio<wbr/>Configuration</a></li>
+<li class="tsd-kind-type-alias"><a href="../types/AudioTrackState.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Audio<wbr/>Track<wbr/>State</a></li>
+<li class="tsd-kind-type-alias"><a href="../types/LogLevel.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Log<wbr/>Level</a></li>
 <li class="tsd-kind-type-alias"><a href="../types/Props.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Props</a></li>
+<li class="tsd-kind-type-alias"><a href="../types/SetLogLevelOptions.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-4194304-path"></use><use href="#icon-4194304-text"></use></svg>Set<wbr/>Log<wbr/>Level<wbr/>Options</a></li>
 <li class="tsd-kind-variable"><a href="../variables/AndroidAudioTypePresets.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><rect fill="var(--color-icon-background)" stroke="var(--color-ts-variable)" stroke-width="1.5" x="1" y="1" width="22" height="22" rx="6" id="icon-32-path"></rect><path d="M11.106 16L8.85 7.24H9.966L11.454 13.192C11.558 13.608 11.646 13.996 11.718 14.356C11.79 14.708 11.842 14.976 11.874 15.16C11.906 14.976 11.954 14.708 12.018 14.356C12.09 13.996 12.178 13.608 12.282 13.192L13.758 7.24H14.85L12.582 16H11.106Z" fill="var(--color-text)" id="icon-32-text"></path></svg>Android<wbr/>Audio<wbr/>Type<wbr/>Presets</a></li>
+<li class="tsd-kind-variable"><a href="../variables/log.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-32-path"></use><use href="#icon-32-text"></use></svg>log</a></li>
 <li class="current tsd-kind-function"><a href="VideoView.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><rect fill="var(--color-icon-background)" stroke="var(--color-ts-function)" stroke-width="1.5" x="1" y="1" width="22" height="22" rx="6" id="icon-64-path"></rect><path d="M9.39 16V7.24H14.55V8.224H10.446V11.128H14.238V12.112H10.47V16H9.39Z" fill="var(--color-text)" id="icon-64-text"></path></svg>Video<wbr/>View</a></li>
+<li class="tsd-kind-function"><a href="getDefaultAppleAudioConfigurationForMode.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-64-path"></use><use href="#icon-64-text"></use></svg>get<wbr/>Default<wbr/>Apple<wbr/>Audio<wbr/>Configuration<wbr/>For<wbr/>Mode</a></li>
 <li class="tsd-kind-function"><a href="registerGlobals.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-64-path"></use><use href="#icon-64-text"></use></svg>register<wbr/>Globals</a></li>
+<li class="tsd-kind-function"><a href="setLogLevel.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-64-path"></use><use href="#icon-64-text"></use></svg>set<wbr/>Log<wbr/>Level</a></li>
 <li class="tsd-kind-function"><a href="sortParticipants.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-64-path"></use><use href="#icon-64-text"></use></svg>sort<wbr/>Participants</a></li>
+<li class="tsd-kind-function"><a href="useIOSAudioManagement.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-64-path"></use><use href="#icon-64-text"></use></svg>useIOSAudio<wbr/>Management</a></li>
 <li class="tsd-kind-function"><a href="useParticipant.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-64-path"></use><use href="#icon-64-text"></use></svg>use<wbr/>Participant</a></li>
 <li class="tsd-kind-function"><a href="useRoom.html" class="tsd-index-link"><svg class="tsd-kind-icon" width="24" height="24" viewBox="0 0 24 24"><use href="#icon-64-path"></use><use href="#icon-64-text"></use></svg>use<wbr/>Room</a></li></ul></nav></div></div>
 <div class="container tsd-generator">