Skip to content

Use renegotiations to update publisher connections #6896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
danxuliu wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −3
Draft

Use renegotiations to update publisher connections #6896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f411881
Use renegotiations to update publisher connections with the HPB
danxuliu Feb 10, 2022
833c2f3
Fix creating offers again in Firefox with disabled media and simulcast
danxuliu Feb 16, 2022
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
2 changes: 1 addition & 1 deletion src/utils/webrtc/simplewebrtc/peer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ Peer.prototype.offer = function(options) {
if (sendVideo && this.enableSimulcast && adapter.browserDetails.browser === 'firefox') {
console.debug('Enabling Simulcasting for Firefox (RID)')
const sender = this.pc.getSenders().find(function(s) {
return s.track.kind === 'video'
return s.track && s.track.kind === 'video'
})
if (sender) {
let parameters = sender.getParameters()
Expand Down
23 changes: 21 additions & 2 deletions src/utils/webrtc/webrtc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,16 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
// one forced reconnection even if there are several peers.
// FIXME: despite all of the above this is a dirty and ugly hack
// that should be fixed with proper renegotiation.
forceReconnect(signaling, flags)
if (signaling.hasFeature('mcu') && signaling.hasFeature('update-sdp') && peer === ownPeer) {
// The handler for "localTrackReplaced" already updated the
// flags, so it is not needed to do it again (in the case of
// forced reconnection it is, as otherwise it will reconnect
// with the current flags, which may not have been updated
// yet after the request).
peer.start()
} else {
forceReconnect(signaling, flags)
}
}
})
}
Expand Down Expand Up @@ -1126,6 +1135,11 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
// point it is not possible to know if that will happen (getting the
// new track is an async operation and it could fail), so the flags
// are updated only with the known values.
//
// Note that, when the HPB is used, it is not possible to
// renegotiate the existing connection to remove the sender, as the
// HPB will immediately close the connection as soon as the
// publishing permission of an active media is revoked.
forceReconnect(signaling, flags)

return
Expand Down Expand Up @@ -1393,7 +1407,12 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
let flags = signaling.getCurrentCallFlags()
flags |= PARTICIPANT.CALL_FLAG.WITH_VIDEO

forceReconnect(signaling, flags)
if (signaling.hasFeature('mcu') && signaling.hasFeature('update-sdp') && ownPeer) {
signaling.updateCurrentCallFlags(flags)
ownPeer.start()
} else {
forceReconnect(signaling, flags)
}
})

webrtc.webrtc.on('iceFailed', function(/* peer */) {
Expand Down