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

Fixes issue with switching desktop stream.

This commit is contained in:
paweldomas 2015-01-05 12:56:31 +01:00
parent 4fb7001b00
commit 087c26d494
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/strophe/strophe.jingle.sdp.js
View File

@ -72,8 +72,8 @@ SDP.prototype.containsSSRC = function(ssrc) {
}; };
function SDPDiffer(mySDP, otherSDP) { function SDPDiffer(mySDP, otherSDP) {
this.mySDP = new SDP(mySDP); this.mySDP = mySDP;
this.otherSDP = new SDP(otherSDP); this.otherSDP = otherSDP;
} }
/** /**

57
libs/strophe/strophe.jingle.session.js
View File

@ -968,43 +968,20 @@ JingleSession.prototype.switchStreams = function (new_stream, oldStream, success
*/ */
JingleSession.prototype.notifyMySSRCUpdate = function (old_sdp, new_sdp) { JingleSession.prototype.notifyMySSRCUpdate = function (old_sdp, new_sdp) {
if (!(this.peerconnection.signalingState == 'stable' && this.peerconnection.iceConnectionState == 'connected')){ if (!(this.peerconnection.signalingState == 'stable' &&
this.peerconnection.iceConnectionState == 'connected')){
console.log("Too early to send updates"); console.log("Too early to send updates");
return; return;
} }
// send source-add IQ.
var sdpDiffer = new SDPDiffer(old_sdp, new_sdp);
var add = $iq({to: self.peerjid, type: 'set'})
.c('jingle', {
xmlns: 'urn:xmpp:jingle:1',
action: 'source-add',
initiator: self.initiator,
sid: self.sid
}
);
var added = sdpDiffer.toJingle(add);
if (added) {
this.connection.sendIQ(add,
function (res) {
console.info('got add result', res);
},
function (err) {
console.error('got add error', err);
}
);
} else {
console.log('addition not necessary');
}
// send source-remove IQ. // send source-remove IQ.
sdpDiffer = new SDPDiffer(new_sdp, old_sdp); sdpDiffer = new SDPDiffer(new_sdp, old_sdp);
var remove = $iq({to: self.peerjid, type: 'set'}) var remove = $iq({to: this.peerjid, type: 'set'})
.c('jingle', { .c('jingle', {
xmlns: 'urn:xmpp:jingle:1', xmlns: 'urn:xmpp:jingle:1',
action: 'source-remove', action: 'source-remove',
initiator: self.initiator, initiator: this.initiator,
sid: self.sid sid: this.sid
} }
); );
var removed = sdpDiffer.toJingle(remove); var removed = sdpDiffer.toJingle(remove);
@ -1020,6 +997,30 @@ JingleSession.prototype.notifyMySSRCUpdate = function (old_sdp, new_sdp) {
} else { } else {
console.log('removal not necessary'); console.log('removal not necessary');
} }
// send source-add IQ.
var sdpDiffer = new SDPDiffer(old_sdp, new_sdp);
var add = $iq({to: this.peerjid, type: 'set'})
.c('jingle', {
xmlns: 'urn:xmpp:jingle:1',
action: 'source-add',
initiator: this.initiator,
sid: this.sid
}
);
var added = sdpDiffer.toJingle(add);
if (added) {
this.connection.sendIQ(add,
function (res) {
console.info('got add result', res);
},
function (err) {
console.error('got add error', err);
}
);
} else {
console.log('addition not necessary');
}
}; };
/** /**