Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ class BrowserCallInteropTest {
if (ready) scope.launch { runCatching { link.onNegotiationNeeded() }.onFailure { failure.set(it.toString()) } }
}
override fun onAddTrack(receiver: RtpReceiver?, streams: Array<out MediaStream>?) { receiver?.track()?.let { received[it.id()] = it } }
override fun onTrack(transceiver: RtpTransceiver?) = Unit
override fun onTrack(transceiver: RtpTransceiver?) {
transceiver?.receiver?.track()?.let { received[it.id()] = it }
}
}
val pc = requireNotNull(factory.createPeerConnection(configuration, observer))
val videoSource = factory.createVideoSource(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,14 @@ class WebRtcEngine(
refreshRemoteTracks()
}

// Unified Plan fires this once a transceiver's receiver has a
// track to hand over.
override fun onTrack(transceiver: RtpTransceiver?) = refreshRemoteTracks()
// Unified Plan delivers the receiver here. Do not rely on the
// older onAddTrack callback also firing: refreshRemoteTracks reads
// the separately owned objects in `received`, because a fresh
// getTransceivers() snapshot disposes its previous Java wrappers.
override fun onTrack(transceiver: RtpTransceiver?) {
transceiver?.receiver?.track()?.let { received[it.id()] = it }
refreshRemoteTracks()
}
}

fun attach(connection: PeerConnection) {
Expand Down
Loading