Merge branch 'master' into callstats_fix

JitsiConference.js

@@ -351,6 +351,13 @@ JitsiConference.prototype.addTrack = function (track) {
                                    track.audioLevelHandler);
             //FIXME: This dependacy is not necessary. This is quick fix.
             track._setConference(this);
+
+            // send event for starting screen sharing
+            // FIXME: we assume we have only one screen sharing track
+            // if we change this we need to fix this check
+            if (track.isVideoTrack() && track.videoType === "desktop")
+                this.statistics.sendScreenSharingEvent(true);
+
             this.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, track);
             resolve(track);
         }.bind(this));
@@ -391,6 +398,7 @@ JitsiConference.prototype.removeTrack = function (track) {
     {
         throw new Error(JitsiTrackErrors.TRACK_IS_DISPOSED);
     }
+
     if(!this.room){
         if(this.rtc) {
             this.rtc.removeLocalStream(track);
@@ -410,6 +418,13 @@ JitsiConference.prototype.removeTrack = function (track) {
                 track.audioLevelHandler);
             this.room.removeListener(XMPPEvents.SENDRECV_STREAMS_CHANGED,
                 track.ssrcHandler);
+
+            // send event for stopping screen sharing
+            // FIXME: we assume we have only one screen sharing track
+            // if we change this we need to fix this check
+            if (track.isVideoTrack() && track.videoType === "desktop")
+                this.statistics.sendScreenSharingEvent(false);
+
             this.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
             resolve();
         }.bind(this), {
@@ -575,6 +590,10 @@ JitsiConference.prototype.onDisplayNameChanged = function (jid, displayName) {
     if (!participant) {
         return;
     }
+
+    if (participant._displayName === displayName)
+        return;
+
     participant._displayName = displayName;
     this.eventEmitter.emit(JitsiConferenceEvents.DISPLAY_NAME_CHANGED, id, displayName);
 };
@@ -826,10 +845,10 @@ JitsiConference.prototype.getLogs = function () {
 };
 
 /**
- * Returns measured performanceTimes.
+ * Returns measured connectionTimes.
  */
-JitsiConference.prototype.getPerformanceTimes = function () {
-    return this.room.performanceTimes;
+JitsiConference.prototype.getConnectionTimes = function () {
+    return this.room.connectionTimes;
 };
 
 /**
@@ -866,7 +885,7 @@ function setupListeners(conference) {
         if (conference.room.isFocus(jingleSession.peerjid)) {
             // Accept incoming call
             conference.room.setJingleSession(jingleSession);
-            conference.room.performanceTimes["session.initiate"] = now;
+            conference.room.connectionTimes["session.initiate"] = now;
             jingleSession.initialize(false /* initiator */, conference.room);
             conference.rtc.onIncommingCall(jingleSession);
             jingleSession.acceptOffer(jingleOffer, null,

JitsiConnection.js

@@ -94,10 +94,10 @@ JitsiConnection.prototype.removeEventListener = function (event, listener) {
 }
 
 /**
- * Returns measured performanceTimes.
+ * Returns measured connectionTimes.
  */
-JitsiConnection.prototype.getPerformanceTimes = function () {
-    return this.xmpp.performanceTimes;
+JitsiConnection.prototype.getConnectionTimes = function () {
+    return this.xmpp.connectionTimes;
 };
 
 module.exports = JitsiConnection;

JitsiTrackErrors.js

@@ -12,7 +12,9 @@ module.exports = {
             (error.constraintName == "minWidth" ||
             error.constraintName == "maxWidth" ||
             error.constraintName == "minHeight" ||
-            error.constraintName == "maxHeight") &&
+            error.constraintName == "maxHeight" ||
+            error.constraintName == "width" ||
+            error.constraintName == "height") &&
             devices.indexOf("video") !== -1) {
                 return this.UNSUPPORTED_RESOLUTION;
         } else if(typeof error === "object" && error.type === "jitsiError") {

connection_optimization/external_connect.js

@@ -33,7 +33,7 @@ function createConnectionExternally(webserviceUrl, success_callback,
 
     xhttp.onreadystatechange = function() {
         if (xhttp.readyState == xhttp.DONE) {
-            var now = window.performanceTimes["external_connect.done"] =
+            var now = window.connectionTimes["external_connect.done"] =
                 window.performance.now();
             console.log("(TIME) external connect XHR done:\t", now);
             if (xhttp.status == HTTP_STATUS_OK) {
@@ -53,8 +53,8 @@ function createConnectionExternally(webserviceUrl, success_callback,
     xhttp.timeout = 3000;
 
     xhttp.open("GET", webserviceUrl, true);
-    window.performanceTimes = {};
-    var now = window.performanceTimes["external_connect.sending"] =
+    window.connectionTimes = {};
+    var now = window.connectionTimes["external_connect.sending"] =
         window.performance.now();
     console.log("(TIME) Sending external connect XHR:\t", now);
     xhttp.send();

modules/statistics/CallStats.js

@@ -32,7 +32,9 @@ var fabricEvent = {
     videoResume:"videoResume",
     fabricUsageEvent:"fabricUsageEvent",
     fabricStats:"fabricStats",
-    fabricTerminated:"fabricTerminated"
+    fabricTerminated:"fabricTerminated",
+    screenShareStart:"screenShareStart",
+    screenShareStop:"screenShareStop"
 };
 
 var callStats = null;
@@ -209,6 +211,17 @@ CallStats.sendMuteEvent = _try_catch(function (mute, type, cs) {
     CallStats._reportEvent.call(cs, event);
 });
 
+/**
+ * Notifies CallStats for screen sharing events
+ * @param start {boolean} true for starting screen sharing and
+ * false for not stopping
+ */
+CallStats.sendScreenSharingEvent = _try_catch(function (start, cs) {
+
+    CallStats._reportEvent.call(cs,
+        start? fabricEvent.screenShareStart : fabricEvent.screenShareStop);
+});
+
 /**
  * Reports an error to callstats.
  *

modules/statistics/statistics.js

@@ -193,6 +193,16 @@ Statistics.prototype.sendMuteEvent = function (muted, type) {
         CallStats.sendMuteEvent(muted, type, this.callstats);
 };
 
+/**
+ * Notifies CallStats for screen sharing events
+ * @param start {boolean} true for starting screen sharing and
+ * false for not stopping
+ */
+Statistics.prototype.sendScreenSharingEvent = function (start) {
+    if(this.callStatsIntegrationEnabled)
+        CallStats.sendScreenSharingEvent(start, this.callstats);
+};
+
 /**
  * Lets the underlying statistics module know where is given SSRC rendered by
  * providing renderer tag ID.

modules/xmpp/ChatRoom.js

@@ -76,14 +76,14 @@ function ChatRoom(connection, jid, password, XMPP, options, settings) {
     this.bridgeIsDown = false;
     this.options = options || {};
     this.moderator = new Moderator(this.roomjid, this.xmpp, this.eventEmitter,
-        settings);
+        settings, {connection: this.xmpp.options, conference: this.options});
     this.initPresenceMap();
     this.session = null;
     var self = this;
     this.lastPresences = {};
     this.phoneNumber = null;
     this.phonePin = null;
-    this.performanceTimes = {};
+    this.connectionTimes = {};
 }
 
 ChatRoom.prototype.initPresenceMap = function () {
@@ -264,9 +264,9 @@ ChatRoom.prototype.onPresence = function (pres) {
         }
         if (!this.joined) {
             this.joined = true;
-            var now = this.performanceTimes["muc.joined"] =
+            var now = this.connectionTimes["muc.joined"] =
                 window.performance.now();
-            console.log("(TIME) MUC joined:\t", now);
+            logger.log("(TIME) MUC joined:\t", now);
             this.eventEmitter.emit(XMPPEvents.MUC_JOINED);
         }
     } else if (this.members[from] === undefined) {
@@ -655,7 +655,7 @@ ChatRoom.prototype.addAudioInfoToPresence = function (mute) {
     this.removeFromPresence("audiomuted");
     this.addToPresence("audiomuted",
         {attributes:
-        {"audions": "http://jitsi.org/jitmeet/audio"},
+        {"xmlns": "http://jitsi.org/jitmeet/audio"},
             value: mute.toString()});
 };
 
@@ -672,7 +672,7 @@ ChatRoom.prototype.addVideoInfoToPresence = function (mute) {
     this.removeFromPresence("videomuted");
     this.addToPresence("videomuted",
         {attributes:
-        {"videons": "http://jitsi.org/jitmeet/video"},
+        {"xmlns": "http://jitsi.org/jitmeet/video"},
             value: mute.toString()});
 };
 

modules/xmpp/JingleSessionPC.js

@@ -152,11 +152,9 @@ JingleSessionPC.prototype.doInitialize = function () {
      */
     this.peerconnection.oniceconnectionstatechange = function (event) {
         if (!(self && self.peerconnection)) return;
-        self.room.performanceTimes["ice.state"] =
-            self.room.performanceTimes["ice.state"] || [];
         var now = window.performance.now();
-        self.room.performanceTimes["ice.state"].push(
-            {state: self.peerconnection.iceConnectionState, time: now});
+        self.room.connectionTimes["ice.state." +
+            self.peerconnection.iceConnectionState] = now;
         logger.log("(TIME) ICE " + self.peerconnection.iceConnectionState +
                     ":\t", now);
         self.updateModifySourcesQueue();
@@ -785,6 +783,7 @@ JingleSessionPC.prototype.removeSource = function (elem) {
                 lines += 'a=ssrc-group:' + semantics + ' ' + ssrcs.join(' ') + '\r\n';
             }
         });
+        var ssrcs = [];
         var 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');
@@ -793,18 +792,23 @@ JingleSessionPC.prototype.removeSource = function (elem) {
                 logger.error("Got remove stream request for my own ssrc: "+ssrc);
                 return;
             }
-            $(this).find('>parameter').each(function () {
-                lines += 'a=ssrc:' + ssrc + ' ' + $(this).attr('name');
-                if ($(this).attr('value') && $(this).attr('value').length)
-                    lines += ':' + $(this).attr('value');
-                lines += '\r\n';
-            });
+            ssrcs.push(ssrc);
         });
         sdp.media.forEach(function(media, idx) {
             if (!SDPUtil.find_line(media, 'a=mid:' + name))
                 return;
-            sdp.media[idx] += lines;
             if (!self.removessrc[idx]) self.removessrc[idx] = '';
+            ssrcs.forEach(function(ssrc) {
+                var ssrcLines = SDPUtil.find_lines(media, 'a=ssrc:' + ssrc);
+                if (ssrcLines.length)
+                    self.removessrc[idx] += ssrcLines.join("\r\n")+"\r\n";
+                // Clear any pending 'source-add' for this SSRC 
+                if (self.addssrc[idx]) {
+                    self.addssrc[idx]
+                        = self.addssrc[idx].replace(
+                            new RegExp('^a=ssrc:'+ssrc+' .*\r\n', 'gm'), '');
+                }
+            });
             self.removessrc[idx] += lines;
         });
         sdp.raw = sdp.session + sdp.media.join('');

modules/xmpp/TraceablePeerConnection.js

@@ -400,7 +400,7 @@ var normalizePlanB = function(desc) {
                 for (i = 0; i<mLine.ssrcs.length; i++){
                     if (typeof mLine.ssrcs[i] === 'object'
                         && typeof mLine.ssrcs[i].id !== 'undefined'
-                        && !$.inArray(mLine.ssrcs[i].id, firstSsrcs)) {
+                        && firstSsrcs.indexOf(mLine.ssrcs[i].id) >= 0) {
                         newSsrcLines.push(mLine.ssrcs[i]);
                         delete mLine.ssrcs[i];
                     }

modules/xmpp/moderator.js

@@ -21,7 +21,7 @@ function createExpBackoffTimer(step) {
     };
 }
 
-function Moderator(roomName, xmpp, emitter, settings) {
+function Moderator(roomName, xmpp, emitter, settings, options) {
     this.roomName = roomName;
     this.xmppService = xmpp;
     this.getNextTimeout = createExpBackoffTimer(1000);
@@ -29,11 +29,13 @@ function Moderator(roomName, xmpp, emitter, settings) {
     // External authentication stuff
     this.externalAuthEnabled = false;
     this.settings = settings;
+    this.options = options;
+
     // Sip gateway can be enabled by configuring Jigasi host in config.js or
     // it will be enabled automatically if focus detects the component through
     // service discovery.
-    this.sipGatewayEnabled = this.xmppService.options.hosts &&
-        this.xmppService.options.hosts.call_control !== undefined;
+    this.sipGatewayEnabled = this.options.connection.hosts &&
+        this.options.connection.hosts.call_control !== undefined;
 
     this.eventEmitter = emitter;
 
@@ -94,10 +96,10 @@ Moderator.prototype.getFocusUserJid =  function () {
 
 Moderator.prototype.getFocusComponent =  function () {
     // Get focus component address
-    var focusComponent = this.xmppService.options.hosts.focus;
+    var focusComponent = this.options.connection.hosts.focus;
     // If not specified use default:  'focus.domain'
     if (!focusComponent) {
-        focusComponent = 'focus.' + this.xmppService.options.hosts.domain;
+        focusComponent = 'focus.' + this.options.connection.hosts.domain;
     }
     return focusComponent;
 };
@@ -109,7 +111,6 @@ Moderator.prototype.createConferenceIq =  function () {
     // Session Id used for authentication
     var sessionId = this.settings.getSessionId();
     var machineUID = this.settings.getUserId();
-    var options = this.xmppService.options;
 
     logger.info(
             "Session ID: " + sessionId + " machine UID: " + machineUID);
@@ -123,75 +124,85 @@ Moderator.prototype.createConferenceIq =  function () {
     if (sessionId) {
         elem.attrs({ 'session-id': sessionId});
     }
-    if (options.hosts !== undefined && options.hosts.bridge !== undefined) {
+    if (this.options.connection.hosts !== undefined
+        && this.options.connection.hosts.bridge !== undefined) {
         elem.c(
             'property', {
                 name: 'bridge',
-                value: options.hosts.bridge
+                value: this.options.connection.hosts.bridge
             }).up();
     }
-    if (options.enforcedBridge !== undefined) {
+    if (this.options.connection.enforcedBridge !== undefined) {
         elem.c(
             'property', {
                 name: 'enforcedBridge',
-                value: options.enforcedBridge
+                value: this.options.connection.enforcedBridge
             }).up();
     }
     // Tell the focus we have Jigasi configured
-    if (options.hosts !== undefined &&
-        options.hosts.call_control !== undefined) {
+    if (this.options.connection.hosts !== undefined &&
+        this.options.connection.hosts.call_control !== undefined) {
         elem.c(
             'property', {
                 name: 'call_control',
-                value: options.hosts.call_control
+                value: this.options.connection.hosts.call_control
             }).up();
     }
-    if (options.channelLastN !== undefined) {
+    if (this.options.conference.channelLastN !== undefined) {
         elem.c(
             'property', {
                 name: 'channelLastN',
-                value: options.channelLastN
+                value: this.options.conference.channelLastN
             }).up();
     }
-    if (options.adaptiveLastN !== undefined) {
+    if (this.options.conference.adaptiveLastN !== undefined) {
         elem.c(
             'property', {
                 name: 'adaptiveLastN',
-                value: options.adaptiveLastN
+                value: this.options.conference.adaptiveLastN
             }).up();
     }
-    if (options.disableAdaptiveSimulcast !== undefined ||
-        options.disableSimulcast) {
+    if (this.options.conference.disableAdaptiveSimulcast !== undefined ||
+        this.options.conference.disableSimulcast) {
         // disableSimulcast implies disableAdaptiveSimulcast.
-        var value = options.disableSimulcast ? true :
-            options.disableAdaptiveSimulcast;
+        var value = this.options.conference.disableSimulcast ? true :
+            this.options.conference.disableAdaptiveSimulcast;
         elem.c(
             'property', {
                 name: 'disableAdaptiveSimulcast',
                 value: value
             }).up();
     }
-    if (options.openSctp !== undefined) {
+    // TODO: re-enable once rtx is stable
+    //if (this.options.conference.disableRtx !== undefined) {
+        elem.c(
+            'property', {
+                name: 'disableRtx',
+                //value: this.options.conference.disableRtx
+                value: true
+            }).up();
+    //}
+    if (this.options.conference.openSctp !== undefined) {
         elem.c(
             'property', {
                 name: 'openSctp',
-                value: options.openSctp
+                value: this.options.conference.openSctp
             }).up();
     }
-    if (options.startAudioMuted !== undefined)
+    if (this.options.conference.startAudioMuted !== undefined)
     {
         elem.c(
             'property', {
                 name: 'startAudioMuted',
-                value: options.startAudioMuted
+                value: this.options.conference.startAudioMuted
             }).up();
     }
-    if (options.startVideoMuted !== undefined)
+    if (this.options.conference.startVideoMuted !== undefined)
     {
         elem.c(
             'property', {
                 name: 'startVideoMuted',
-                value: options.startVideoMuted
+                value: this.options.conference.startVideoMuted
             }).up();
     }
 
@@ -263,7 +274,7 @@ Moderator.prototype.parseConfigOptions =  function (resultIq) {
  */
 Moderator.prototype.allocateConferenceFocus =  function (callback) {
     // Try to use focus user JID from the config
-    this.setFocusUserJid(this.xmppService.options.focusUserJid);
+    this.setFocusUserJid(this.options.connection.focusUserJid);
     // Send create conference IQ
     var self = this;
     this.connection.sendIQ(
@@ -272,7 +283,7 @@ Moderator.prototype.allocateConferenceFocus =  function (callback) {
             self._allocateConferenceFocusSuccess(result, callback);
         },
         function (error) {
-            self._allocateConferenceFocusError(error);
+            self._allocateConferenceFocusError(error, callback);
         });
     // XXX We're pressed for time here because we're beginning a complex and/or
     // lengthy conference-establishment process which supposedly involves
@@ -322,7 +333,7 @@ Moderator.prototype._allocateConferenceFocusError = function (error, callback) {
     if ($(error).find('>error>not-authorized').length) {
         logger.warn("Unauthorized to start the conference", error);
         var toDomain = Strophe.getDomainFromJid(error.getAttribute('to'));
-        if (toDomain !== self.xmppService.options.hosts.anonymousdomain) {
+        if (toDomain !== self.options.connection.hosts.anonymousdomain) {
             //FIXME "is external" should come either from the focus or config.js
             self.externalAuthEnabled = true;
         }

modules/xmpp/strophe.jingle.js

@@ -95,7 +95,7 @@ module.exports = function(XMPP, eventEmitter) {
             switch (action) {
                 case 'session-initiate':
                     var now = window.performance.now();
-                    console.log("(TIME) received session-initiate:\t", now);
+                    logger.log("(TIME) received session-initiate:\t", now);
                     var startMuted = $(iq).find('jingle>startmuted');
                     if (startMuted && startMuted.length > 0) {
                         var audioMuted = startMuted.attr("audio");

modules/xmpp/xmpp.js

@@ -37,7 +37,7 @@ function XMPP(options, token) {
     this.eventEmitter = new EventEmitter();
     this.connection = null;
     this.disconnectInProgress = false;
-    this.performanceTimes = {status: []};
+    this.connectionTimes = {};
     this.forceMuted = false;
     this.options = options;
     initStrophePlugins(this);
@@ -62,9 +62,7 @@ XMPP.prototype.getConnection = function () { return this.connection; };
  */
 XMPP.prototype.connectionHandler = function (password, status, msg) {
     var now = window.performance.now();
-    this.performanceTimes["status"].push(
-        {state: Strophe.getStatusString(status),
-        time: now});
+    this.connectionTimes[Strophe.getStatusString(status).toLowerCase()] = now;
     logger.log("(TIME) Strophe " + Strophe.getStatusString(status) +
         (msg ? "[" + msg + "]" : "") + ":\t", now);
     if (status === Strophe.Status.CONNECTED ||
@@ -171,7 +169,7 @@ XMPP.prototype._connect = function (jid, password) {
  * @param options {object} connecting options - rid, sid, jid and password.
  */
  XMPP.prototype.attach = function (options) {
-    var now = this.performanceTimes["attaching"] = window.performance.now();
+    var now = this.connectionTimes["attaching"] = window.performance.now();
     logger.log("(TIME) Strophe Attaching\t:" + now);
     this.connection.attach(options.jid, options.sid, parseInt(options.rid,10)+1,
         this.connectionHandler.bind(this, options.password));

package.json

@@ -19,7 +19,7 @@
     "pako": "*",
     "sdp-interop": "0.1.11",
     "sdp-transform": "1.5.*",
-    "sdp-simulcast": "0.1.5",
+    "sdp-simulcast": "0.1.6",
     "async": "0.9.0",
     "retry": "0.6.1",
     "jssha": "1.5.0",