|
|
@@ -1162,14 +1162,11 @@ var RTC = {
|
|
1162
|
1162
|
this.localStreams[0].getOriginalStream() != stream)
|
|
1163
|
1163
|
this.localStreams.push(localStream);
|
|
1164
|
1164
|
if(isMuted === true)
|
|
1165
|
|
- localStream.setMute(false);
|
|
|
1165
|
+ localStream.setMute(true);
|
|
1166
|
1166
|
|
|
1167
|
|
- if(type == "audio")
|
|
1168
|
|
- {
|
|
|
1167
|
+ if(type == "audio") {
|
|
1169
|
1168
|
this.localAudio = localStream;
|
|
1170
|
|
- }
|
|
1171
|
|
- else
|
|
1172
|
|
- {
|
|
|
1169
|
+ } else {
|
|
1173
|
1170
|
this.localVideo = localStream;
|
|
1174
|
1171
|
}
|
|
1175
|
1172
|
var eventType = StreamEventTypes.EVENT_TYPE_LOCAL_CREATED;
|
|
|
@@ -14514,6 +14511,10 @@ JingleSession.prototype.addSource = function (elem, fromJid) {
|
|
14514
|
14511
|
console.warn("Got add stream request for my own ssrc: "+ssrc);
|
|
14515
|
14512
|
return;
|
|
14516
|
14513
|
}
|
|
|
14514
|
+ if (sdp.containsSSRC(ssrc)) {
|
|
|
14515
|
+ console.warn("Source-add request for existing SSRC: " + ssrc);
|
|
|
14516
|
+ return;
|
|
|
14517
|
+ }
|
|
14517
|
14518
|
$(this).find('>parameter').each(function () {
|
|
14518
|
14519
|
lines += 'a=ssrc:' + ssrc + ' ' + $(this).attr('name');
|
|
14519
|
14520
|
if ($(this).attr('value') && $(this).attr('value').length)
|
|
|
@@ -18022,12 +18023,12 @@ module.exports = function(XMPP, eventEmitter)
|
|
18022
|
18023
|
switch (action) {
|
|
18023
|
18024
|
case 'session-initiate':
|
|
18024
|
18025
|
var startMuted = $(iq).find('jingle>startmuted');
|
|
18025
|
|
- if(startMuted && startMuted.length > 0)
|
|
|
18026
|
+ if (startMuted && startMuted.length > 0)
|
|
18026
|
18027
|
{
|
|
18027
|
18028
|
var audioMuted = startMuted.attr("audio");
|
|
18028
|
18029
|
var videoMuted = startMuted.attr("video");
|
|
18029
|
18030
|
eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
|
|
18030
|
|
- autioMuted === "true", videoMuted === "true");
|
|
|
18031
|
+ audioMuted === "true", videoMuted === "true");
|
|
18031
|
18032
|
}
|
|
18032
|
18033
|
sess = new JingleSession(
|
|
18033
|
18034
|
$(iq).attr('to'), $(iq).find('jingle').attr('sid'),
|
|
|
@@ -18898,7 +18899,7 @@ var XMPP = {
|
|
18898
|
18899
|
// It is not clear what is the right way to handle multiple tracks.
|
|
18899
|
18900
|
// So at least make sure that they are all muted or all unmuted and
|
|
18900
|
18901
|
// that we send presence just once.
|
|
18901
|
|
- APP.RTC.localAudio.setMute(!mute);
|
|
|
18902
|
+ APP.RTC.localAudio.setMute(mute);
|
|
18902
|
18903
|
// isMuted is the opposite of audioEnabled
|
|
18903
|
18904
|
this.sendAudioInfoPresence(mute, callback);
|
|
18904
|
18905
|
return true;
|