David Liu

Fix proto buf references

... ... @@ -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<LivekitRtc.SpeakerInfo>)
fun onUpdateSpeakers(speakers: List<LivekitModels.SpeakerInfo>)
fun onDisconnect(reason: String)
fun onFailToConnect(error: Exception)
fun onUserPacket(packet: LivekitRtc.UserPacket, kind: LivekitRtc.DataPacket.Kind)
fun onUserPacket(packet: LivekitModels.UserPacket, kind: LivekitModels.DataPacket.Kind)
}
companion object {
... ... @@ -369,7 +369,7 @@ constructor(
listener?.onUpdateParticipants(updates)
}
override fun onActiveSpeakersChanged(speakers: List<LivekitRtc.SpeakerInfo>) {
override fun onActiveSpeakersChanged(speakers: List<LivekitModels.SpeakerInfo>) {
listener?.onUpdateSpeakers(speakers)
}
... ... @@ -400,15 +400,15 @@ constructor(
if (buffer == null) {
return
}
val dp = LivekitRtc.DataPacket.parseFrom(buffer.data)
val dp = LivekitModels.DataPacket.parseFrom(buffer.data)
when (dp.valueCase) {
LivekitRtc.DataPacket.ValueCase.SPEAKER -> {
LivekitModels.DataPacket.ValueCase.SPEAKER -> {
listener?.onUpdateSpeakers(dp.speaker.speakersList)
}
LivekitRtc.DataPacket.ValueCase.USER -> {
LivekitModels.DataPacket.ValueCase.USER -> {
listener?.onUserPacket(dp.user, dp.kind)
}
LivekitRtc.DataPacket.ValueCase.VALUE_NOT_SET,
LivekitModels.DataPacket.ValueCase.VALUE_NOT_SET,
null -> {
Timber.v { "invalid value for data packet" }
}
... ...
... ... @@ -109,7 +109,7 @@ constructor(
return participant
}
private fun handleSpeakerUpdate(speakerInfos: List<LivekitRtc.SpeakerInfo>) {
private fun handleSpeakerUpdate(speakerInfos: List<LivekitModels.SpeakerInfo>) {
val speakers = mutableListOf<Participant>()
val seenSids = mutableSetOf<String>()
val localParticipant = localParticipant
... ... @@ -289,14 +289,14 @@ constructor(
/**
* @suppress
*/
override fun onUpdateSpeakers(speakers: List<LivekitRtc.SpeakerInfo>) {
override fun onUpdateSpeakers(speakers: List<LivekitModels.SpeakerInfo>) {
handleSpeakerUpdate(speakers)
}
/**
* @suppress
*/
override fun onUserPacket(packet: LivekitRtc.UserPacket, kind: LivekitRtc.DataPacket.Kind) {
override fun onUserPacket(packet: LivekitModels.UserPacket, kind: LivekitModels.DataPacket.Kind) {
val participant = remoteParticipants[packet.participantSid] ?: return
val data = packet.payload.toByteArray()
... ...
... ... @@ -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<LivekitRtc.SpeakerInfo>)
fun onActiveSpeakersChanged(speakers: List<LivekitModels.SpeakerInfo>)
fun onClose(reason: String, code: Int)
fun onLeave()
fun onError(error: Exception)
... ...
... ... @@ -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 = LivekitRtc.UserPacket.newBuilder().
val packetBuilder = LivekitModels.UserPacket.newBuilder().
setPayload(ByteString.copyFrom(data)).
setParticipantSid(sid)
if (destination != null) {
packetBuilder.addAllDestinationSids(destination)
}
val dataPacket = LivekitRtc.DataPacket.newBuilder().
val dataPacket = LivekitModels.DataPacket.newBuilder().
setUser(packetBuilder).
setKind(kind).
build()
... ...