Leaves ssrcOwners for local use in JingleSessionPC, uses remote streams from RTC for ssrc mapping to resources. For local video/audio stream ssrc to resource we use JingleSessionPC.localStreamsSSRC.

JitsiConference.js

@@ -1053,11 +1053,12 @@ function setupListeners(conference) {
         //FIXME: Maybe remove event should not be associated with the conference.
         conference.statistics.addAudioLevelListener(function (ssrc, level) {
             var userId = null;
-            var jid = conference.room.getJidBySSRC(ssrc);
-            if (!jid)
+
+            var resource = conference.rtc.getResourceBySSRC(ssrc);
+            if (!resource)
                 return;
 
-            conference.rtc.setAudioLevel(jid, level);
+            conference.rtc.setAudioLevel(resource, level);
         });
         conference.statistics.addConnectionStatsListener(function (stats) {
             var ssrc2resolution = stats.resolution;
@@ -1074,18 +1075,7 @@ function setupListeners(conference) {
                     return;
                 }
 
-                var jid = conference.room.getJidBySSRC(ssrc);
-                if (!jid) {
-                    return;
-                }
-
-                var id;
-                if (jid === conference.room.session.me) {
-                    id = conference.myUserId();
-                } else {
-                    id = Strophe.getResourceFromJid(jid);
-                }
-
+                var id = conference.rtc.getResourceBySSRC(ssrc);
                 if (!id) {
                     return;
                 }

modules/RTC/JitsiRemoteTrack.js

@@ -71,6 +71,13 @@ JitsiRemoteTrack.prototype.isLocal = function () {
     return false;
 };
 
+/**
+ * Return false;
+ */
+JitsiRemoteTrack.prototype.getSSRC = function () {
+    return this.ssrc;
+};
+
 /**
  * Changes the video type of the track
  * @param type the new video type("camera", "desktop")

modules/RTC/RTC.js

@@ -262,12 +262,34 @@ RTC.prototype.switchVideoStreams = function (newStream) {
     this.localStreams.push(this.localVideo);
 };
 
-RTC.prototype.setAudioLevel = function (jid, audioLevel) {
-    if(!jid)
+RTC.prototype.setAudioLevel = function (resource, audioLevel) {
+    if(!resource)
         return;
-    var resource = Strophe.getResourceFromJid(jid);
     if(this.remoteStreams[resource] && this.remoteStreams[resource][JitsiTrack.AUDIO])
         this.remoteStreams[resource][JitsiTrack.AUDIO].setAudioLevel(audioLevel);
 };
 
+/**
+ * Searches in localStreams(session stores ssrc for audio and video) and
+ * remoteStreams for the ssrc and returns the corresponding resource.
+ * @param ssrc the ssrc to check.
+ */
+RTC.prototype.getResourceBySSRC = function (ssrc) {
+    if(ssrc == this.room.session.localStreamsSSRC.video
+        || ssrc == this.room.session.localStreamsSSRC.audio) {
+        return Strophe.getResourceFromJid(this.room.myroomjid);
+    }
+
+    var resultResource = null;
+    $.each(this.remoteStreams, function (resource, remoteTracks) {
+        if((remoteTracks[JitsiTrack.AUDIO]
+                && remoteTracks[JitsiTrack.AUDIO].getSSRC() == ssrc)
+            || (remoteTracks[JitsiTrack.VIDEO]
+                && remoteTracks[JitsiTrack.AUDIO].getSSRC() == ssrc))
+            resultResource = resource;
+    });
+
+    return resultResource;
+};
+
 module.exports = RTC;

modules/xmpp/ChatRoom.js

@@ -661,12 +661,6 @@ ChatRoom.prototype.remoteStreamAdded = function(data, sid, thessrc) {
     this.eventEmitter.emit(XMPPEvents.REMOTE_STREAM_RECEIVED, data, sid, thessrc);
 };
 
-ChatRoom.prototype.getJidBySSRC = function (ssrc) {
-    if (!this.session)
-        return null;
-    return this.session.getSsrcOwner(ssrc);
-};
-
 /**
  * Returns true if the recording is supproted and false if not.
  */

modules/xmpp/JingleSessionPC.js

@@ -40,14 +40,20 @@ function JingleSessionPC(me, sid, connection, service) {
     this.switchstreams = false;
     this.addingStreams = false;
 
-    this.wait = true;
     /**
      * A map that stores SSRCs of local streams
      * @type {{}} maps media type('audio' or 'video') to SSRC number
      */
     this.localStreamsSSRC = {};
+    /**
+     * A map that stores SSRCs of remote streams. And is used only locally
+     * We store the mapping when jingle is received, and later is used
+     * onaddstream webrtc event where we have only the ssrc
+     * FIXME: This map got filled and never cleaned and can grow durring long
+     * conference
+     * @type {{}} maps SSRC number to jid
+     */
     this.ssrcOwners = {};
-    this.ssrcVideoTypes = {};
 
     this.webrtcIceUdpDisable = !!this.service.options.webrtcIceUdpDisable;
     this.webrtcIceTcpDisable = !!this.service.options.webrtcIceTcpDisable;
@@ -557,10 +563,6 @@ JingleSessionPC.prototype.getLocalSSRC = function (mediaType) {
     return this.localStreamsSSRC[mediaType];
 };
 
-JingleSessionPC.prototype.getSsrcOwner = function (ssrc) {
-    return this.ssrcOwners[ssrc];
-};
-
 JingleSessionPC.prototype.setRemoteDescription = function (elem, desctype) {
     //logger.log('setting remote description... ', desctype);
     this.remoteSDP = new SDP('');
@@ -1463,17 +1465,6 @@ JingleSessionPC.prototype.setLocalDescription = function () {
         }
 
     });
-
-    logger.log('new ssrcs', newssrcs);
-
-    // Bind us as local SSRCs owner
-    if (newssrcs.length > 0) {
-        for (i = 0; i < newssrcs.length; i++) {
-            var ssrc = newssrcs[i].ssrc;
-            var myJid = self.me;
-            self.ssrcOwners[ssrc] = myJid;
-        }
-    }
 }
 
 // an attempt to work around https://github.com/jitsi/jitmeet/issues/32