squash: Address review comments.

JitsiConferenceEventManager.js

@@ -173,11 +173,16 @@ JitsiConferenceEventManager.prototype.setupChatRoomListeners = function() {
         }
     });
 
-    chatRoom.addListener(JitsiTrackEvents.TRACK_OWNER_ADDED, track => {
-        conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, track);
-    });
-    chatRoom.addListener(JitsiTrackEvents.TRACK_OWNER_REMOVED, track => {
-        conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
+    chatRoom.addListener(JitsiTrackEvents.TRACK_OWNER_SET, (track, owner, sourceName, videoType) => {
+        if (track.getParticipantId() !== owner || track.getSourceName() !== sourceName) {
+            conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_REMOVED, track);
+
+            // Update the owner and other properties on the track.
+            track.setOwner(owner);
+            track.setSourceName(sourceName);
+            track._setVideoType(videoType);
+            owner && conference.eventEmitter.emit(JitsiConferenceEvents.TRACK_ADDED, track);
+        }
     });
 
     this.chatRoomForwarder.forward(XMPPEvents.ROOM_JOIN_ERROR,

JitsiTrackEvents.spec.ts

@@ -8,8 +8,7 @@ describe( "/JitsiTrackEvents members", () => {
         TRACK_AUDIO_LEVEL_CHANGED,
         TRACK_AUDIO_OUTPUT_CHANGED,
         TRACK_MUTE_CHANGED,
-        TRACK_OWNER_ADDED,
-        TRACK_OWNER_REMOVED,
+        TRACK_OWNER_SET,
         TRACK_STREAMING_STATUS_CHANGED,
         TRACK_VIDEOTYPE_CHANGED,
         NO_DATA_FROM_SOURCE,
@@ -23,8 +22,7 @@ describe( "/JitsiTrackEvents members", () => {
         expect( TRACK_AUDIO_LEVEL_CHANGED ).toBe( 'track.audioLevelsChanged' );
         expect( TRACK_AUDIO_OUTPUT_CHANGED ).toBe( 'track.audioOutputChanged' );
         expect( TRACK_MUTE_CHANGED ).toBe( 'track.trackMuteChanged' );
-        expect( TRACK_OWNER_ADDED ).toBe( 'track.owner_added' );
-        expect( TRACK_OWNER_REMOVED ).toBe( 'track.owner_removed' );
+        expect( TRACK_OWNER_SET ).toBe( 'track.owner_set' );
         expect( TRACK_STREAMING_STATUS_CHANGED ).toBe( 'track.streaming_status_changed' );
         expect( TRACK_VIDEOTYPE_CHANGED ).toBe( 'track.videoTypeChanged' );
         expect( NO_DATA_FROM_SOURCE ).toBe( 'track.no_data_from_source' );
@@ -36,8 +34,7 @@ describe( "/JitsiTrackEvents members", () => {
         expect( JitsiTrackEvents.TRACK_AUDIO_LEVEL_CHANGED ).toBe( 'track.audioLevelsChanged' );
         expect( JitsiTrackEvents.TRACK_AUDIO_OUTPUT_CHANGED ).toBe( 'track.audioOutputChanged' );
         expect( JitsiTrackEvents.TRACK_MUTE_CHANGED ).toBe( 'track.trackMuteChanged' );
-        expect( JitsiTrackEvents.TRACK_OWNER_ADDED ).toBe( 'track.owner_added' );
-        expect( JitsiTrackEvents.TRACK_OWNER_REMOVED ).toBe( 'track.owner_removed' );
+        expect( JitsiTrackEvents.TRACK_OWNER_SET ).toBe( 'track.owner_set' );
         expect( JitsiTrackEvents.TRACK_STREAMING_STATUS_CHANGED ).toBe( 'track.streaming_status_changed' );
         expect( JitsiTrackEvents.TRACK_VIDEOTYPE_CHANGED ).toBe( 'track.videoTypeChanged' );
         expect( JitsiTrackEvents.NO_DATA_FROM_SOURCE ).toBe( 'track.no_data_from_source' );

JitsiTrackEvents.ts

@@ -48,12 +48,7 @@ export enum JitsiTrackEvents {
     /**
      * Indicates that a new owner has been assigned to a remote track when SSRC rewriting is enabled.
      */
-    TRACK_OWNER_ADDED = 'track.owner_added',
-
-    /**
-     * Indicates that an owner has been removed from a remote track when SSRC rewriting is enabled.
-     */
-    TRACK_OWNER_REMOVED = 'track.owner_removed',
+    TRACK_OWNER_SET = 'track.owner_set',
 
     /**
      * Event fired whenever video track's streaming changes.
@@ -77,6 +72,5 @@ export const TRACK_MUTE_CHANGED = JitsiTrackEvents.TRACK_MUTE_CHANGED;
 export const TRACK_VIDEOTYPE_CHANGED = JitsiTrackEvents.TRACK_VIDEOTYPE_CHANGED;
 export const NO_DATA_FROM_SOURCE = JitsiTrackEvents.NO_DATA_FROM_SOURCE;
 export const NO_AUDIO_INPUT = JitsiTrackEvents.NO_AUDIO_INPUT;
-export const TRACK_OWNER_ADDED = JitsiTrackEvents.TRACK_OWNER_ADDED;
-export const TRACK_OWNER_REMOVED = JitsiTrackEvents.TRACK_OWNER_REMOVED;
+export const TRACK_OWNER_SET = JitsiTrackEvents.TRACK_OWNER_SET;
 export const TRACK_STREAMING_STATUS_CHANGED = JitsiTrackEvents.TRACK_STREAMING_STATUS_CHANGED;

modules/xmpp/JingleSessionPC.js

@@ -1777,32 +1777,21 @@ export default class JingleSessionPC extends JingleSession {
                     const track = this.peerconnection.getTrackBySSRC(oldSsrc);
 
                     if (track) {
-                        track.setSourceName(null);
-                        track.setOwner(null);
-                        track._setVideoType(null);
-                        this.room.eventEmitter.emit(JitsiTrackEvents.TRACK_OWNER_REMOVED, track);
+                        this.room.eventEmitter.emit(JitsiTrackEvents.TRACK_OWNER_SET, track);
                     }
                 }
             } else {
                 logger.debug(`Existing SSRC re-mapped ${ssrc}: new owner=${owner}, source-name=${source}`);
                 const track = this.peerconnection.getTrackBySSRC(ssrc);
 
-                this.room.eventEmitter.emit(JitsiTrackEvents.TRACK_OWNER_REMOVED, track);
-
                 this._signalingLayer.setSSRCOwner(ssrc, owner, source);
-                track.setSourceName(source);
-                track.setOwner(owner);
-
-                this.room.eventEmitter.emit(JitsiTrackEvents.TRACK_OWNER_ADDED, track);
 
                 // Update the muted state and the video type on the track since the presence for this track could have
                 // been received before the updated source map is received on the bridge channel.
-                const peerMediaInfo = this._signalingLayer.getPeerMediaInfo(owner, mediaType, source);
+                const { muted, videoType } = this._signalingLayer.getPeerMediaInfo(owner, mediaType, source);
 
-                if (peerMediaInfo) {
-                    track._setVideoType(peerMediaInfo.videoType);
-                    this.peerconnection._sourceMutedChanged(source, peerMediaInfo.muted);
-                }
+                muted && this.peerconnection._sourceMutedChanged(source, muted);
+                this.room.eventEmitter.emit(JitsiTrackEvents.TRACK_OWNER_SET, track, owner, source, videoType);
             }
         }