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-07-11 20:20:31 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Committed by
GitHub
2022-07-11 20:20:31 +0900
Commit
2f349057a87cf8e000a74596501f07a296cccd8d
2f349057
1 parent
ea5d90ff
Protocol 8 (#112)
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
25 行增加
和
4 行删除
livekit-android-sdk/src/main/java/io/livekit/android/ConnectOptions.kt
livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt
livekit-android-sdk/src/main/java/io/livekit/android/room/SignalClient.kt
livekit-android-sdk/src/main/java/io/livekit/android/stats/ClientInfo.kt
livekit-android-sdk/src/main/java/io/livekit/android/ConnectOptions.kt
查看文件 @
2f34905
package io.livekit.android
import io.livekit.android.room.ProtocolVersion
import org.webrtc.PeerConnection
...
...
@@ -17,6 +18,11 @@ data class ConnectOptions(
* capture and publish video track on connect, defaults to false
*/
val video: Boolean = false,
/**
* the protocol version to use with the server.
*/
val protocolVersion: ProtocolVersion = ProtocolVersion.v8
) {
internal var reconnect: Boolean = false
}
...
...
livekit-android-sdk/src/main/java/io/livekit/android/LiveKit.kt
查看文件 @
2f34905
...
...
@@ -4,6 +4,7 @@ import android.app.Application
import android.content.Context
import io.livekit.android.dagger.DaggerLiveKitComponent
import io.livekit.android.dagger.create
import io.livekit.android.room.ProtocolVersion
import io.livekit.android.room.Room
import io.livekit.android.room.RoomListener
import io.livekit.android.util.LKLog
...
...
@@ -82,6 +83,7 @@ class LiveKit {
* @param url URL to LiveKit server (i.e. ws://mylivekitdeploy.io)
* @param listener Listener to Room events. LiveKit interactions take place with these callbacks
*/
@Deprecated("Use LiveKit.create and Room.connect instead. This is limited to max protocol 7.")
suspend fun connect(
appContext: Context,
url: String,
...
...
@@ -94,7 +96,11 @@ class LiveKit {
val room = create(appContext, roomOptions, overrides)
room.listener = listener
room.connect(url, token, options)
val protocolVersion = maxOf(options.protocolVersion, ProtocolVersion.v7)
val connectOptions = options.copy(protocolVersion = protocolVersion)
room.connect(url, token, connectOptions)
return room
}
...
...
livekit-android-sdk/src/main/java/io/livekit/android/room/SignalClient.kt
查看文件 @
2f34905
...
...
@@ -128,6 +128,7 @@ constructor(
val queryParams = mutableListOf<Pair<String, String>>()
queryParams.add(CONNECT_QUERY_TOKEN to token)
queryParams.add(CONNECT_QUERY_PROTOCOL to options.protocolVersion.value.toString())
if (options.reconnect) {
queryParams.add(CONNECT_QUERY_RECONNECT to 1.toString())
...
...
@@ -142,7 +143,6 @@ constructor(
// Client info
queryParams.add(CONNECT_QUERY_SDK to "android")
queryParams.add(CONNECT_QUERY_VERSION to clientInfo.version)
queryParams.add(CONNECT_QUERY_PROTOCOL to clientInfo.protocol.toString())
queryParams.add(CONNECT_QUERY_DEVICE_MODEL to clientInfo.deviceModel)
queryParams.add(CONNECT_QUERY_OS to clientInfo.os)
queryParams.add(CONNECT_QUERY_OS_VERSION to clientInfo.osVersion)
...
...
@@ -604,7 +604,6 @@ constructor(
const val SD_TYPE_ANSWER = "answer"
const val SD_TYPE_OFFER = "offer"
const val SD_TYPE_PRANSWER = "pranswer"
const val PROTOCOL_VERSION = 7
const val SDK_TYPE = "android"
private val skipQueueTypes = listOf(
...
...
@@ -627,4 +626,15 @@ constructor(
// iceServer("stun:stun4.l.google.com:19302"),
)
}
}
enum class ProtocolVersion(val value: Int) {
v1(1),
v2(2),
v3(3),
v4(4),
v5(5),
v6(6),
v7(7),
v8(8),
}
\ No newline at end of file
...
...
livekit-android-sdk/src/main/java/io/livekit/android/stats/ClientInfo.kt
查看文件 @
2f34905
...
...
@@ -7,7 +7,6 @@ import livekit.LivekitModels
internal fun getClientInfo() = with(LivekitModels.ClientInfo.newBuilder()) {
sdk = LivekitModels.ClientInfo.SDK.ANDROID
protocol = SignalClient.PROTOCOL_VERSION
version = BuildConfig.VERSION_NAME
os = SignalClient.SDK_TYPE
osVersion = Build.VERSION.RELEASE ?: ""
...
...
请
注册
或
登录
后发表评论