Merge pull request #59 from damencho/callstats-screen-share-events

Adds screenShareStart and screenShareStop events to callstats reports.

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), {

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

@@ -199,6 +199,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.