Skip to content

Improve setting initial audio and video status when the HPB is used #4181

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 9 commits into from
Oct 15, 2020
Merged

Improve setting initial audio and video status when the HPB is used #4181

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a10718f
Fix some signaling messages not handled with external signaling server
danxuliu Sep 19, 2020
535ba2b
Send initial state messages for connections also through signaling
danxuliu Sep 19, 2020
e374156
Extract function to send current media state
danxuliu Sep 19, 2020
25f3cd5
Repeat initial state messages when the HPB is used
danxuliu Sep 19, 2020
f43bdaf
Fix sending initial media state to participants without audio or video
danxuliu Sep 24, 2020
b03939e
Remove unneeded code
danxuliu Sep 19, 2020
62dad5c
Remove unneeded condition
danxuliu Sep 25, 2020
cfdcddb
Extract functions to stop checking audio and media state
danxuliu Sep 25, 2020
1440652
Stop checking for peer media if audio/video status is received
danxuliu Sep 25, 2020
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
Prev Previous commit
Next Next commit
Extract function to send current media state 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Sep 25, 2020
commit e3741565dc96073267e506d89f1b01fcf61035a9
25 changes: 15 additions & 10 deletions src/utils/webrtc/webrtc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,19 @@ function checkStartPublishOwnPeer(signaling) {
localCallParticipantModel.setPeer(ownPeer)
}

function sendCurrentMediaState() {
if (!webrtc.webrtc.isVideoEnabled()) {
webrtc.webrtc.emit('videoOff')
} else {
webrtc.webrtc.emit('videoOn')
}
if (!webrtc.webrtc.isAudioEnabled()) {
webrtc.webrtc.emit('audioOff')
} else {
webrtc.webrtc.emit('audioOn')
}
}

function userHasStreams(user) {
let flags = user
if (flags.hasOwnProperty('inCall')) {
Expand Down Expand Up @@ -485,16 +498,8 @@ export default function initWebRTC(signaling, _callParticipantCollection, _local
function handleIceConnectionStateConnected(peer) {
// Send the current information about the video and microphone
// state.
if (!webrtc.webrtc.isVideoEnabled()) {
webrtc.webrtc.emit('videoOff')
} else {
webrtc.webrtc.emit('videoOn')
}
if (!webrtc.webrtc.isAudioEnabled()) {
webrtc.webrtc.emit('audioOff')
} else {
webrtc.webrtc.emit('audioOn')
}
sendCurrentMediaState()

if (signaling.settings.userId === null) {
const currentGuestNick = store.getters.getDisplayName()
sendDataChannelToAll('status', 'nickChanged', currentGuestNick)
Expand Down