Skip to content

[stable21.1] Fix switching devices during a call if started without audio nor video #5662

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

Merged
nickvergessen merged 2 commits into from
May 25, 2021
Merged

[stable21.1] Fix switching devices during a call if started without audio nor video #5662

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
57fc75d
Handle track changes when call was started without audio or video
danxuliu May 20, 2021
2d0c0bc
Do not show an error if explicitly joining a call without media
danxuliu May 20, 2021
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
17 changes: 11 additions & 6 deletions src/utils/webrtc/simplewebrtc/localmedia.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ LocalMedia.prototype.start = function(mediaConstraints, cb, context) {
webrtcIndex.mediaDevicesManager.disableDeviceEvents()
}

// The handlers for "change:audioInputId" and "change:videoInputId" events
// expect the initial "getUserMedia" call to have been completed before
// being used, so they must be set when the promise is resolved or rejected.

webrtcIndex.mediaDevicesManager.getUserMedia(constraints).then(function(stream) {
// Although the promise should be resolved only if all the constraints
// are met Edge resolves it if both audio and video are requested but
Expand Down Expand Up @@ -187,8 +191,8 @@ LocalMedia.prototype.start = function(mediaConstraints, cb, context) {
}
}).catch(function(err) {
// Fallback for users without a camera or with a camera that can not be
// accessed.
if (self.config.audioFallback && constraints.video !== false) {
// accessed, but only if audio is meant to be used.
if (constraints.audio !== false && self.config.audioFallback && constraints.video !== false) {
self.emit('localStreamRequestFailedRetryNoVideo', constraints, err)
constraints.video = false
self.start(constraints, cb, 'retry-no-video')
Expand All @@ -197,6 +201,9 @@ LocalMedia.prototype.start = function(mediaConstraints, cb, context) {

self.emit('localStreamRequestFailed', constraints)

webrtcIndex.mediaDevicesManager.on('change:audioInputId', self._handleAudioInputIdChangedBound)
webrtcIndex.mediaDevicesManager.on('change:videoInputId', self._handleVideoInputIdChangedBound)

if (cb) {
return cb(err, null)
}
Expand Down Expand Up @@ -484,10 +491,8 @@ LocalMedia.prototype.stop = function(stream) {
this.stopStream(stream)
this.stopScreenShare(stream)

if (!this.localStreams.length) {
webrtcIndex.mediaDevicesManager.off('change:audioInputId', this._handleAudioInputIdChangedBound)
webrtcIndex.mediaDevicesManager.off('change:videoInputId', this._handleVideoInputIdChangedBound)
}
webrtcIndex.mediaDevicesManager.off('change:audioInputId', this._handleAudioInputIdChangedBound)
webrtcIndex.mediaDevicesManager.off('change:videoInputId', this._handleVideoInputIdChangedBound)
}

LocalMedia.prototype.stopStream = function(stream) {
Expand Down
42 changes: 42 additions & 0 deletions src/utils/webrtc/webrtc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ let callParticipantCollection = null
let localCallParticipantModel = null
let showedTURNWarning = false
let sendCurrentStateWithRepetitionTimeout = null
let startedWithMedia

function arrayDiff(a, b) {
return a.filter(function(i) {
Expand Down Expand Up @@ -524,6 +525,8 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
})

webrtc.startMedia = function(token) {
startedWithMedia = undefined

webrtc.joinCall(token)
}

Expand Down Expand Up @@ -844,6 +847,8 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
// reconnection is forced to start sending it.
signaling.setSendVideoIfAvailable(true)

startedWithMedia = true

let flags = signaling.getCurrentCallFlags()
flags |= PARTICIPANT.CALL_FLAG.WITH_VIDEO

Expand Down Expand Up @@ -909,9 +914,38 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
}
})

webrtc.on('localTrackReplaced', function(newTrack /*, oldTrack, stream */) {
// Device disabled, nothing to do here.
if (!newTrack) {
return
}

// If the call was started with media the connections will be already
// established. If it has not started yet the connections will be
// established once started.
if (startedWithMedia || startedWithMedia === undefined) {
return
}

// If the call was originally started without media the participant
// needs to reconnect to establish the sender connections.
startedWithMedia = true

let flags = signaling.getCurrentCallFlags()
if (newTrack.kind === 'audio') {
flags |= PARTICIPANT.CALL_FLAG.WITH_AUDIO
} else if (newTrack.kind === 'video') {
flags |= PARTICIPANT.CALL_FLAG.WITH_VIDEO
}

forceReconnect(signaling, flags)
})

webrtc.on('localMediaStarted', function(/* configuration */) {
console.info('localMediaStarted')

startedWithMedia = true

clearLocalStreamRequestedTimeoutAndHideNotification()

if (signaling.hasFeature('mcu')) {
Expand All @@ -922,8 +956,16 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
webrtc.on('localMediaError', function(error) {
console.warn('Access to microphone & camera failed', error)

startedWithMedia = false

clearLocalStreamRequestedTimeoutAndHideNotification()

if (error.name === 'TypeError') {
// Both audio and video were explicitly disabled, no need to show an
// error.
return
}

let message
let timeout = TOAST_PERMANENT_TIMEOUT
if ((error.name === 'NotSupportedError'
Expand Down