Merge pull request #113 from jitsi/removes_fake_tracks

Removes fake video tracks from the code

JitsiConference.js

@@ -629,6 +629,13 @@ JitsiConference.prototype.onDisplayNameChanged = function (jid, displayName) {
     this.eventEmitter.emit(JitsiConferenceEvents.DISPLAY_NAME_CHANGED, id, displayName);
 };
 
+/**
+ * Notifies this JitsiConference that a JitsiRemoteTrack was added (into the
+ * ChatRoom of this JitsiConference).
+ *
+ * @param {JitsiRemoteTrack} track the JitsiRemoteTrack which was added to this
+ * JitsiConference
+ */
 JitsiConference.prototype.onTrackAdded = function (track) {
     var id = track.getParticipantId();
     var participant = this.getParticipantById(id);
@@ -636,16 +643,7 @@ JitsiConference.prototype.onTrackAdded = function (track) {
         return;
     }
 
-    //FIXME: This is temporary fix
-    //Make sure that no fake tracks are left.
-    if(track.isVideoTrack() && !track.isFake) {
-        //Remove the fake video track
-        participant._tracks = participant._tracks.filter(function (track) {
-            return !track.isFake;
-        });
-    }
-
-    // add track to JitsiParticipant
+    // Add track to JitsiParticipant.
     participant._tracks.push(track);
 
     var emitter = this.eventEmitter;
@@ -658,11 +656,14 @@ JitsiConference.prototype.onTrackAdded = function (track) {
     track.addEventListener(
         JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED,
         function (audioLevel) {
-            emitter.emit(JitsiConferenceEvents.TRACK_AUDIO_LEVEL_CHANGED, id, audioLevel);
+            emitter.emit(
+                JitsiConferenceEvents.TRACK_AUDIO_LEVEL_CHANGED,
+                id,
+                audioLevel);
         }
     );
 
-    this.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, track);
+    emitter.emit(JitsiConferenceEvents.TRACK_ADDED, track);
 };
 
 JitsiConference.prototype.updateDTMFSupport = function () {
@@ -966,11 +967,6 @@ function setupListeners(conference) {
             });
         }
     );
-    conference.rtc.addListener(RTCEvents.FAKE_VIDEO_TRACK_CREATED,
-        function (track) {
-            conference.onTrackAdded(track);
-        }
-    );
 
     conference.room.addListener(XMPPEvents.AUDIO_MUTED_BY_FOCUS,
         function (value) {

modules/RTC/JitsiRemoteTrack.js

@@ -11,17 +11,15 @@ var JitsiTrackEvents = require("../../JitsiTrackEvents");
  * @param videoType the VideoType of the JitsiRemoteTrack
  * @param ssrc the SSRC number of the Media Stream
  * @param muted intial muted state of the JitsiRemoteTrack
- * @param isFake true if the track is not associated with Media Stream.
  * @constructor
  */
 function JitsiRemoteTrack(RTC, ownerJid, stream, track, mediaType, videoType,
-                          ssrc, muted, isFake) {
+                          ssrc, muted) {
     JitsiTrack.call(
         this, RTC, stream, track, function () {}, mediaType, videoType, ssrc);
     this.rtc = RTC;
     this.peerjid = ownerJid;
     this.muted = muted;
-    this.isFake = isFake? isFake : false;
 }
 
 JitsiRemoteTrack.prototype = Object.create(JitsiTrack.prototype);

modules/RTC/RTC.js

@@ -42,23 +42,10 @@ function RTC(room, options) {
     var self = this;
     this.options = options || {};
     room.addPresenceListener("videomuted", function (values, from) {
-        if(!self.remoteTracks[from])
-            return;
         var videoTrack = self.getRemoteVideoTrack(from);
-        // If there is no video track, but we receive it is muted,
-        // we need to create a dummy track which we will mute, so we can
-        // notify interested about the muting
-        if (!videoTrack) {
-            videoTrack = self.createRemoteTrack({
-                    owner: room.roomjid + "/" + from,
-                    videoType: VideoType.CAMERA,
-                    mediaType: MediaType.VIDEO,
-                    isFake: true
-                });
-            self.eventEmitter
-                .emit(RTCEvents.FAKE_VIDEO_TRACK_CREATED, videoTrack);
+        if (videoTrack) {
+            videoTrack.setMute(values.value == "true");
         }
-        videoTrack.setMute(values.value == "true");
     });
     room.addPresenceListener("audiomuted", function (values, from) {
         var audioTrack = self.getRemoteAudioTrack(from);
@@ -254,21 +241,26 @@ RTC.prototype.removeLocalTrack = function (track) {
     }
 };
 
+/**
+ * Initializes a new JitsiRemoteTrack instance with the data provided by (a)
+ * ChatRoom to XMPPEvents.REMOTE_TRACK_ADDED.
+ *
+ * @param {Object} event the data provided by (a) ChatRoom to
+ * XMPPEvents.REMOTE_TRACK_ADDED to (a)
+ */
 RTC.prototype.createRemoteTrack = function (event) {
     var ownerJid = event.owner;
     var remoteTrack = new JitsiRemoteTrack(
         this,  ownerJid, event.stream,    event.track,
-        event.mediaType, event.videoType, event.ssrc, event.muted, event.isFake);
+        event.mediaType, event.videoType, event.ssrc, event.muted);
     var resource = Strophe.getResourceFromJid(ownerJid);
-    if(!this.remoteTracks[resource]) {
-        this.remoteTracks[resource] = {};
-    }
+    var remoteTracks
+        = this.remoteTracks[resource] || (this.remoteTracks[resource] = {});
     var mediaType = remoteTrack.getType();
-    if (this.remoteTracks[resource][mediaType]) {
-        logger.warn(
-            "Overwriting remote track !", resource, mediaType);
+    if (remoteTracks[mediaType]) {
+        logger.warn("Overwriting remote track!", resource, mediaType);
     }
-    this.remoteTracks[resource][mediaType] = remoteTrack;
+    remoteTracks[mediaType] = remoteTrack;
     return remoteTrack;
 };
 

service/RTC/RTCEvents.js

@@ -5,10 +5,9 @@ var RTCEvents = {
     DOMINANTSPEAKER_CHANGED: "rtc.dominantspeaker_changed",
     LASTN_ENDPOINT_CHANGED: "rtc.lastn_endpoint_changed",
     AVAILABLE_DEVICES_CHANGED: "rtc.available_devices_changed",
-    FAKE_VIDEO_TRACK_CREATED: "rtc.fake_video_track_created",
     TRACK_ATTACHED: "rtc.track_attached",
     AUDIO_OUTPUT_DEVICE_CHANGED: "rtc.audio_output_device_changed",
     DEVICE_LIST_CHANGED: "rtc.device_list_changed"
 };
 
-module.exports = RTCEvents;
+module.exports = RTCEvents;