haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't add the x-goog-conference flag if there are no simulcast senders

This commit is contained in:
George Politis 2014-11-10 10:02:04 +01:00
parent aa5c2c11ad
commit 41fd416338
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
simulcast.js
View File

@ -732,25 +732,28 @@ NativeSimulcastSender.prototype.transformLocalDescription = function (desc) {
*/ */
SimulcastReceiver.prototype.transformRemoteDescription = function (desc) { SimulcastReceiver.prototype.transformRemoteDescription = function (desc) {
var sb = desc.sdp.split('\r\n'); if (desc && desc.sdp) {
var sb = desc.sdp.split('\r\n');
this._updateRemoteMaps(sb); this._updateRemoteMaps(sb);
this._cacheRemoteVideoSources(sb); this._cacheRemoteVideoSources(sb);
// NOTE(gp) this needs to be called after updateRemoteMaps because we need the simulcast group in the _updateRemoteMaps() method. // NOTE(gp) this needs to be called after updateRemoteMaps because we need the simulcast group in the _updateRemoteMaps() method.
this.simulcastUtils._removeSimulcastGroup(sb); this.simulcastUtils._removeSimulcastGroup(sb);
// We don't need the goog conference flag if we're not doing native if (desc.sdp.indexOf('a=ssrc-group:SIM') !== -1) {
// simulcast, but at the receiver, we have no idea if the sender is // We don't need the goog conference flag if we're not doing
// doing native or not-native simulcast. // simulcast.
this._ensureGoogConference(sb); this._ensureGoogConference(sb);
}
desc = new RTCSessionDescription({ desc = new RTCSessionDescription({
type: desc.type, type: desc.type,
sdp: sb.join('\r\n') sdp: sb.join('\r\n')
}); });
this.logger.fine(['Transformed remote description', desc.sdp].join(' ')); this.logger.fine(['Transformed remote description', desc.sdp].join(' '));
}
return desc; return desc;
}; };
@ -1200,15 +1203,15 @@ function SimulcastLogger(name) {
} }
SimulcastLogger.prototype.log = function (text) { SimulcastLogger.prototype.log = function (text) {
console.log(text); console.log(text);
}; };
SimulcastLogger.prototype.info = function (text) { SimulcastLogger.prototype.info = function (text) {
console.info(text); console.info(text);
}; };
SimulcastLogger.prototype.fine = function (text) { SimulcastLogger.prototype.fine = function (text) {
console.log(text); console.log(text);
}; };
SimulcastLogger.prototype.error = function (text) { SimulcastLogger.prototype.error = function (text) {