Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
xuning
/
livekitAndroidXuningTest
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
davidliu
2022-10-24 21:43:18 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Committed by
GitHub
2022-10-24 21:43:18 +0900
Commit
cec0b2bd84783c3979778f78a357723a676e049f
cec0b2bd
1 parent
57d46163
Force relay client configuration (#155)
* Update protocol submodule * Force relay configuration * tests
显示空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
32 行增加
和
4 行删除
livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
livekit-android-sdk/src/test/java/io/livekit/android/mock/MockPeerConnection.kt
livekit-android-sdk/src/test/java/io/livekit/android/room/RTCEngineMockE2ETest.kt
livekit-android-sdk/src/test/java/org/webrtc/MockPeerConnectionFactory.kt
protocol
livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
查看文件 @
cec0b2b
...
...
@@ -201,6 +201,14 @@ internal constructor(
PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY
}
if (joinResponse.hasClientConfiguration()) {
val clientConfig = joinResponse.clientConfiguration
if (clientConfig.forceRelay == LivekitModels.ClientConfigSetting.ENABLED) {
rtcConfig.iceTransportsType = PeerConnection.IceTransportsType.RELAY
}
}
_publisher?.close()
_publisher = pctFactory.create(
rtcConfig,
...
...
livekit-android-sdk/src/test/java/io/livekit/android/mock/MockPeerConnection.kt
查看文件 @
cec0b2b
...
...
@@ -7,7 +7,8 @@ private class MockNativePeerConnectionFactory : NativePeerConnectionFactory {
}
class MockPeerConnection(
val observer: PeerConnection.Observer?
val rtcConfig: RTCConfiguration,
val observer: Observer?
) : PeerConnection(MockNativePeerConnectionFactory()) {
private var closed = false
...
...
livekit-android-sdk/src/test/java/io/livekit/android/room/RTCEngineMockE2ETest.kt
查看文件 @
cec0b2b
...
...
@@ -5,8 +5,10 @@ import io.livekit.android.mock.MockPeerConnection
import io.livekit.android.util.toOkioByteString
import io.livekit.android.util.toPBByteString
import kotlinx.coroutines.ExperimentalCoroutinesApi
import livekit.LivekitModels
import livekit.LivekitRtc
import org.junit.Assert
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
...
...
@@ -95,4 +97,21 @@ class RTCEngineMockE2ETest : MockE2ETest() {
Assert.assertNotEquals(oldToken, newToken)
Assert.assertEquals(SignalClientTest.REFRESH_TOKEN.refreshToken, newToken)
}
@Test
fun relayConfiguration() = runTest {
connect(with(SignalClientTest.JOIN.toBuilder()) {
join = with(join.toBuilder()) {
clientConfiguration = with(LivekitModels.ClientConfiguration.newBuilder()) {
forceRelay = LivekitModels.ClientConfigSetting.ENABLED
build()
}
build()
}
build()
})
val pubPeerConnection = rtcEngine.subscriber.peerConnection as MockPeerConnection
assertEquals(PeerConnection.IceTransportsType.RELAY, pubPeerConnection.rtcConfig.iceTransportsType)
}
}
\ No newline at end of file
...
...
livekit-android-sdk/src/test/java/org/webrtc/MockPeerConnectionFactory.kt
查看文件 @
cec0b2b
...
...
@@ -4,11 +4,11 @@ import io.livekit.android.mock.MockPeerConnection
class MockPeerConnectionFactory : PeerConnectionFactory(1L) {
override fun createPeerConnectionInternal(
rtcConfig: PeerConnection.RTCConfiguration
?
,
rtcConfig: PeerConnection.RTCConfiguration,
constraints: MediaConstraints?,
observer: PeerConnection.Observer?,
sslCertificateVerifier: SSLCertificateVerifier?
): PeerConnection {
return MockPeerConnection(observer)
return MockPeerConnection(
rtcConfig,
observer)
}
}
\ No newline at end of file
...
...
protocol
@
3f479682
Subproject commit
6ec04e9ca47ebad2f3426be543fb6cbeef58c2b5
Subproject commit
3f47968225995df268658982f311d5f3942aa223
...
...
请
注册
或
登录
后发表评论