Skip to content

Remove unneeded webrtc code #5679

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 3 commits into from
Jun 1, 2021
Merged

Remove unneeded webrtc code #5679

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c358a84
Remove unused "browserPrefix" attribute
danxuliu Nov 27, 2020
70dbd46
Remove unneeded code
danxuliu Nov 27, 2020
4114775
Remove unused "prefix" signaling message field
danxuliu Nov 27, 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
31 changes: 9 additions & 22 deletions src/utils/webrtc/simplewebrtc/peer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ function Peer(options) {
this.type = options.type || 'video'
this.oneway = options.oneway || false
this.sharemyscreen = options.sharemyscreen || false
this.browserPrefix = options.prefix
this.stream = options.stream
this.sendVideoIfAvailable = options.sendVideoIfAvailable === undefined ? true : options.sendVideoIfAvailable
this.enableDataChannels = options.enableDataChannels === undefined ? this.parent.config.enableDataChannels : options.enableDataChannels
Expand Down Expand Up @@ -226,10 +225,6 @@ Peer.prototype.handleMessage = function(message) {

this.logger.log('getting', message.type, message)

if (message.prefix) {
this.browserPrefix = message.prefix
}

if (message.type === 'offer') {
if (!this.nick) {
this.nick = message.payload.nick
Expand Down Expand Up @@ -269,7 +264,6 @@ Peer.prototype.send = function(messageType, payload) {
roomType: this.type,
type: messageType,
payload: payload,
prefix: webrtcSupport.prefix,
}
this.logger.log('sending', messageType, message)
this.parent.emit('message', message)
Expand Down Expand Up @@ -338,23 +332,16 @@ Peer.prototype.onIceCandidate = function(event) {
return
}
if (candidate) {
const pcConfig = this.parent.config.peerConnectionConfig
if (webrtcSupport.prefix === 'moz' && pcConfig && pcConfig.iceTransports
&& candidate.candidate && candidate.candidate.candidate
&& candidate.candidate.candidate.indexOf(pcConfig.iceTransports) < 0) {
this.logger.log('Ignoring ice candidate not matching pcConfig iceTransports type: ', pcConfig.iceTransports)
} else {
// Retain legacy data structure for compatibility with
// mobile clients.
const expandedCandidate = {
candidate: {
candidate: candidate.candidate,
sdpMid: candidate.sdpMid,
sdpMLineIndex: candidate.sdpMLineIndex,
},
}
this.send('candidate', expandedCandidate)
// Retain legacy data structure for compatibility with
// mobile clients.
const expandedCandidate = {
candidate: {
candidate: candidate.candidate,
sdpMid: candidate.sdpMid,
sdpMLineIndex: candidate.sdpMLineIndex,
},
}
this.send('candidate', expandedCandidate)
} else {
this.logger.log('End of candidates.')
}
Expand Down