Allows the telephony conferences utilizing the Jitsi VideoBridge server-side technology to associate an RTP stream with the participant who is contributing it. Fixes multiple NullPointerExceptions in MediaStreamStatsImpl and OneToOneCallPeerPanel. Fixes an ArrayIndexOutOfBoundsException in AccountID.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java
index 92b2b25..55054ea 100644
--- a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java
+++ b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCallPeer.java
@@ -773,10 +773,10 @@ public abstract class MediaAwareCallPeer
         if (getConferenceMemberCount() > 2)
         {
             // this peer is now a conference focus with more than three
-            // participants. This means that the this peer is mixing and sending
-            // us audio for at least two separate participants. We therefore
-            // need to remove the stream level listeners and switch to CSRC
-            // level listening
+            // participants. This means that this peer is mixing and sending us
+            // audio for at least two separate participants. We therefore need
+            // to remove the stream level listeners and switch to CSRC level
+            // listening
             CallPeerMediaHandler<?> mediaHandler = getMediaHandler();
 
             mediaHandler.setStreamAudioLevelListener(null);
@@ -839,7 +839,8 @@ public abstract class MediaAwareCallPeer
                 && ((conferenceMemberCount = getConferenceMemberCount()) > 0)
                 && (conferenceMemberCount < 3))
         {
-            long audioRemoteSSRC = getMediaHandler().getAudioRemoteSSRC();
+            long audioRemoteSSRC
+                = getMediaHandler().getRemoteSSRC(MediaType.AUDIO);
 
             if (audioRemoteSSRC != CallPeerMediaHandler.SSRC_UNKNOWN)
             {
@@ -873,9 +874,11 @@ public abstract class MediaAwareCallPeer
                 = streamAudioLevelListeners.size();
 
             for(int i = 0; i < streamAudioLevelListenerCount; i++)
+            {
                 streamAudioLevelListeners.get(i).soundLevelChanged(
                         this,
                         newLevel);
+            }
         }
     }