From 309d2c6545c8a6790954782641d28af29ea7a9aa Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Fri, 6 Jun 2014 05:59:39 +0200 Subject: [PATCH 1/4] use msid instead of mslabel since mslabel --- app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 040934ef8..3a2882e09 100644 --- a/app.js +++ b/app.js @@ -265,10 +265,10 @@ $(document).bind('remotestreamadded.jingle', function (event, data, sid) { if (data.stream.id.indexOf('mixedmslabel') === -1) { var ssrclines = SDPUtil.find_lines(sess.peerconnection.remoteDescription.sdp, 'a=ssrc'); ssrclines = ssrclines.filter(function (line) { - return line.indexOf('mslabel:' + data.stream.label) !== -1; + return line.indexOf('msid:' + data.stream.label) !== -1; }); if (ssrclines.length) { - thessrc = ssrclines[0].substring(7).split(' ')[0]; + thessrc = ssrclines[0].substring(5).split(' ')[0]; // ok to overwrite the one from focus? might save work in colibri.js console.log('associated jid', ssrc2jid[thessrc], data.peerjid); if (ssrc2jid[thessrc]) { From 9461c8ee6e48b9026b11f27e93e1aadb0a60112c Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Fri, 6 Jun 2014 06:06:44 +0200 Subject: [PATCH 2/4] use msid instead of mslabel since mslabel --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 3a2882e09..f5bc7d588 100644 --- a/app.js +++ b/app.js @@ -268,7 +268,7 @@ $(document).bind('remotestreamadded.jingle', function (event, data, sid) { return line.indexOf('msid:' + data.stream.label) !== -1; }); if (ssrclines.length) { - thessrc = ssrclines[0].substring(5).split(' ')[0]; + thessrc = ssrclines[0].substring(7).split(' ')[0]; // ok to overwrite the one from focus? might save work in colibri.js console.log('associated jid', ssrc2jid[thessrc], data.peerjid); if (ssrc2jid[thessrc]) { From 679e5bc3d5710031ea3e63cb7c9f7cf8cb43b9db Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Fri, 6 Jun 2014 06:14:20 +0200 Subject: [PATCH 3/4] less label --- app.js | 2 +- libs/colibri/colibri.focus.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index f5bc7d588..c523ff083 100644 --- a/app.js +++ b/app.js @@ -265,7 +265,7 @@ $(document).bind('remotestreamadded.jingle', function (event, data, sid) { if (data.stream.id.indexOf('mixedmslabel') === -1) { var ssrclines = SDPUtil.find_lines(sess.peerconnection.remoteDescription.sdp, 'a=ssrc'); ssrclines = ssrclines.filter(function (line) { - return line.indexOf('msid:' + data.stream.label) !== -1; + return line.indexOf('msid:' + data.stream.id) !== -1; }); if (ssrclines.length) { thessrc = ssrclines[0].substring(7).split(' ')[0]; diff --git a/libs/colibri/colibri.focus.js b/libs/colibri/colibri.focus.js index aa2adaefc..752c62332 100644 --- a/libs/colibri/colibri.focus.js +++ b/libs/colibri/colibri.focus.js @@ -107,7 +107,7 @@ ColibriFocus.prototype.makeConference = function (peers) { this.peerconnection.onaddstream = function (event) { // search the jid associated with this stream Object.keys(self.remotessrc).forEach(function (jid) { - if (self.remotessrc[jid].join('\r\n').indexOf('mslabel:' + event.stream.id) != -1) { + if (self.remotessrc[jid].join('\r\n').indexOf('msid:' + event.stream.id) != -1) { event.peerjid = jid; } }); @@ -894,4 +894,4 @@ ColibriFocus.prototype.sendTerminate = function (session, reason, text) { window.clearInterval(this.statsinterval); this.statsinterval = null; } -}; \ No newline at end of file +}; From 150d275cb3d8b8055e0482ebec6707be190bca80 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Wed, 11 Jun 2014 12:37:21 +0200 Subject: [PATCH 4/4] add link to mailing list --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f21db5cfb..64fe4e7b0 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,9 @@ You can find information on how to deploy Jitsi Meet in the [installation instru You may also find it helpful to have a look at our sample [config files](https://github.com/jitsi/jitsi-meet/tree/master/doc/example-config-files/) +## Discuss +Please use the [Jitsi dev mailing list](http://lists.jitsi.org/pipermail/dev/) to discuss feature requests before opening an issue on github. + ## Acknowledgements Jitsi Meet started out as a sample conferencing application using Jitsi Videobridge. It was originally developed by Philipp Hancke who then contributed it to the community where development continues with joint forces!