Merge pull request #82 from jitsi/jingle-protocol-changes

protocol changes

libs/strophe/strophe.jingle.adapter.js

@@ -208,7 +208,7 @@ TraceablePeerConnection.prototype.addSource = function (elem) {
     $(elem).each(function (idx, content) {
         var name = $(content).attr('name');
         var lines = '';
-        tmp = $(content).find('>source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]');
+        tmp = $(content).find('source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]'); // can handle both >source and >description>source
         tmp.each(function () {
             var ssrc = $(this).attr('ssrc');
             if(mySdp.containsSSRC(ssrc)){
@@ -254,7 +254,7 @@ TraceablePeerConnection.prototype.removeSource = function (elem) {
     $(elem).each(function (idx, content) {
         var name = $(content).attr('name');
         var lines = '';
-        tmp = $(content).find('>source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]');
+        tmp = $(content).find('source[xmlns="urn:xmpp:jingle:apps:rtp:ssma:0"]'); // can handle both >source and >description>source
         tmp.each(function () {
             var ssrc = $(this).attr('ssrc');
             // This should never happen, but can be useful for bug detection

libs/strophe/strophe.jingle.js

@@ -150,10 +150,12 @@ Strophe.addConnectionPlugin('jingle', {
                     $(document).trigger('unmute.jingle', [sess.sid, affected]);
                 }
                 break;
-            case 'addsource': // FIXME: proprietary
+            case 'addsource': // FIXME: proprietary, un-jingleish
+            case 'source-add': // FIXME: proprietary
                 sess.addSource($(iq).find('>jingle>content'), fromJid);
                 break;
-            case 'removesource': // FIXME: proprietary
+            case 'removesource': // FIXME: proprietary, un-jingleish
+            case 'source-remove': // FIXME: proprietary
                 sess.removeSource($(iq).find('>jingle>content'), fromJid);
                 break;
             default:

libs/strophe/strophe.jingle.sessionbase.js

@@ -156,7 +156,7 @@ SessionBase.prototype.sendSSRCUpdateIq = function(sdpMediaSsrcs, sid, initiator,
     var modify = $iq({to: toJid, type: 'set'})
         .c('jingle', {
             xmlns: 'urn:xmpp:jingle:1',
-            action: isAdd ? 'addsource' : 'removesource',
+            action: isAdd ? 'source-add' : 'source-remove',
             initiator: initiator,
             sid: sid
         }
@@ -168,6 +168,8 @@ SessionBase.prototype.sendSSRCUpdateIq = function(sdpMediaSsrcs, sid, initiator,
         modified = true;
         var channel = sdpMediaSsrcs[channelNum];
         modify.c('content', {name: channel.mediaType});
+
+        modify.c('description', {xmlns:'urn:xmpp:jingle:apps:rtp:1', media: channel.mediaType});
         // FIXME: not completly sure this operates on blocks and / or handles different ssrcs correctly
         // generate sources from lines
         Object.keys(channel.ssrcs).forEach(function(ssrcNum) {
@@ -189,6 +191,7 @@ SessionBase.prototype.sendSSRCUpdateIq = function(sdpMediaSsrcs, sid, initiator,
             });
             modify.up(); // end of source
         });
+        modify.up(); // end of description
         modify.up(); // end of content
     });
     if (modified) {
@@ -220,4 +223,4 @@ SessionBase.prototype.toggleVideoMute = function (callback) {
 
     this.peerconnection.hardMuteVideo(!ismuted);
     this.modifySources(callback(!ismuted));
-};
+};