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
David Liu
2021-08-24 00:40:12 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
939cc572ceaee81dcd50c9b783ed843865ea529e
939cc572
1 parent
3e2dd436
Fix proto buf references
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
15 行增加
和
15 行删除
livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt
livekit-android-sdk/src/main/java/io/livekit/android/room/SignalClient.kt
livekit-android-sdk/src/main/java/io/livekit/android/room/participant/LocalParticipant.kt
livekit-android-sdk/src/main/java/io/livekit/android/room/RTCEngine.kt
查看文件 @
939cc57
...
...
@@ -176,10 +176,10 @@ constructor(
fun onIceReconnected()
fun onAddTrack(track: MediaStreamTrack, streams: Array<out MediaStream>)
fun onUpdateParticipants(updates: List<LivekitModels.ParticipantInfo>)
fun onUpdateSpeakers(speakers: List<Livekit
Rtc
.SpeakerInfo>)
fun onUpdateSpeakers(speakers: List<Livekit
Models
.SpeakerInfo>)
fun onDisconnect(reason: String)
fun onFailToConnect(error: Exception)
fun onUserPacket(packet: Livekit
Rtc.UserPacket, kind: LivekitRtc
.DataPacket.Kind)
fun onUserPacket(packet: Livekit
Models.UserPacket, kind: LivekitModels
.DataPacket.Kind)
}
companion object {
...
...
@@ -369,7 +369,7 @@ constructor(
listener?.onUpdateParticipants(updates)
}
override fun onActiveSpeakersChanged(speakers: List<Livekit
Rtc
.SpeakerInfo>) {
override fun onActiveSpeakersChanged(speakers: List<Livekit
Models
.SpeakerInfo>) {
listener?.onUpdateSpeakers(speakers)
}
...
...
@@ -400,15 +400,15 @@ constructor(
if (buffer == null) {
return
}
val dp = Livekit
Rtc
.DataPacket.parseFrom(buffer.data)
val dp = Livekit
Models
.DataPacket.parseFrom(buffer.data)
when (dp.valueCase) {
Livekit
Rtc
.DataPacket.ValueCase.SPEAKER -> {
Livekit
Models
.DataPacket.ValueCase.SPEAKER -> {
listener?.onUpdateSpeakers(dp.speaker.speakersList)
}
Livekit
Rtc
.DataPacket.ValueCase.USER -> {
Livekit
Models
.DataPacket.ValueCase.USER -> {
listener?.onUserPacket(dp.user, dp.kind)
}
Livekit
Rtc
.DataPacket.ValueCase.VALUE_NOT_SET,
Livekit
Models
.DataPacket.ValueCase.VALUE_NOT_SET,
null -> {
Timber.v { "invalid value for data packet" }
}
...
...
livekit-android-sdk/src/main/java/io/livekit/android/room/Room.kt
查看文件 @
939cc57
...
...
@@ -109,7 +109,7 @@ constructor(
return participant
}
private fun handleSpeakerUpdate(speakerInfos: List<Livekit
Rtc
.SpeakerInfo>) {
private fun handleSpeakerUpdate(speakerInfos: List<Livekit
Models
.SpeakerInfo>) {
val speakers = mutableListOf<Participant>()
val seenSids = mutableSetOf<String>()
val localParticipant = localParticipant
...
...
@@ -289,14 +289,14 @@ constructor(
/**
* @suppress
*/
override fun onUpdateSpeakers(speakers: List<Livekit
Rtc
.SpeakerInfo>) {
override fun onUpdateSpeakers(speakers: List<Livekit
Models
.SpeakerInfo>) {
handleSpeakerUpdate(speakers)
}
/**
* @suppress
*/
override fun onUserPacket(packet: Livekit
Rtc.UserPacket, kind: LivekitRtc
.DataPacket.Kind) {
override fun onUserPacket(packet: Livekit
Models.UserPacket, kind: LivekitModels
.DataPacket.Kind) {
val participant = remoteParticipants[packet.participantSid] ?: return
val data = packet.payload.toByteArray()
...
...
livekit-android-sdk/src/main/java/io/livekit/android/room/SignalClient.kt
查看文件 @
939cc57
...
...
@@ -347,7 +347,7 @@ constructor(
fun onTrickle(candidate: IceCandidate, target: LivekitRtc.SignalTarget)
fun onLocalTrackPublished(response: LivekitRtc.TrackPublishedResponse)
fun onParticipantUpdate(updates: List<LivekitModels.ParticipantInfo>)
fun onActiveSpeakersChanged(speakers: List<Livekit
Rtc
.SpeakerInfo>)
fun onActiveSpeakersChanged(speakers: List<Livekit
Models
.SpeakerInfo>)
fun onClose(reason: String, code: Int)
fun onLeave()
fun onError(error: Exception)
...
...
livekit-android-sdk/src/main/java/io/livekit/android/room/participant/LocalParticipant.kt
查看文件 @
939cc57
...
...
@@ -159,21 +159,21 @@ internal constructor(
}
val kind = when (reliability) {
DataPublishReliability.RELIABLE -> LivekitRtc.DataPacket.Kind.RELIABLE
DataPublishReliability.LOSSY -> LivekitRtc.DataPacket.Kind.LOSSY
DataPublishReliability.RELIABLE -> LivekitModels.DataPacket.Kind.RELIABLE
DataPublishReliability.LOSSY -> LivekitModels.DataPacket.Kind.LOSSY
}
val channel = when (reliability) {
DataPublishReliability.RELIABLE -> engine.reliableDataChannel
DataPublishReliability.LOSSY -> engine.lossyDataChannel
} ?: throw TrackException.PublishException("data channel not established")
val packetBuilder = Livekit
Rtc
.UserPacket.newBuilder().
val packetBuilder = Livekit
Models
.UserPacket.newBuilder().
setPayload(ByteString.copyFrom(data)).
setParticipantSid(sid)
if (destination != null) {
packetBuilder.addAllDestinationSids(destination)
}
val dataPacket = Livekit
Rtc
.DataPacket.newBuilder().
val dataPacket = Livekit
Models
.DataPacket.newBuilder().
setUser(packetBuilder).
setKind(kind).
build()
...
...
请
注册
或
登录
后发表评论