Commit work in progress of fixing the implementation of content mixing in Jitsi VideoBridge.

5 files changed, 25 insertions, 21 deletions

diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar
index a275fda..b6b6437 100644
--- a/lib/installer-exclude/libjitsi.jar
+++ b/lib/installer-exclude/libjitsi.jar
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
index a9e5faa..df8d308 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
@@ -150,11 +150,8 @@ public class OperationSetTelephonyConferencingJabberImpl
             MediaAwareCallPeer<?,?,?> callPeer,
             boolean remote)
     {
-        MediaPacketExtension ext = null;
-        CallPeerMediaHandler<?> mediaHandler =
-            callPeer.getMediaHandler();
-        List<MediaPacketExtension> ret =
-            new ArrayList<MediaPacketExtension>();
+        CallPeerMediaHandler<?> mediaHandler = callPeer.getMediaHandler();
+        List<MediaPacketExtension> ret = new ArrayList<MediaPacketExtension>();
         long i = 1;
 
         for(MediaType mediaType : MediaType.values())
@@ -163,23 +160,26 @@ public class OperationSetTelephonyConferencingJabberImpl
 
             if (stream != null)
             {
-                long srcId = remote
-                            ? stream.getRemoteSourceID()
-                                    : stream.getLocalSourceID();
+                MediaPacketExtension ext
+                    = new MediaPacketExtension(Long.toString(i));
+                long srcId
+                    = remote
+                        ? stream.getRemoteSourceID()
+                        : stream.getLocalSourceID();
 
                 if (srcId != -1)
-                {
-                    ext = new MediaPacketExtension(Long.toString(i));
                     ext.setSrcID(Long.toString(srcId));
-                    ext.setType(mediaType.toString());
-                    MediaDirection direction = stream.getDirection();
-
-                    if (direction == null)
-                        direction = MediaDirection.INACTIVE;
-                    ext.setStatus(direction.toString());
-                    ret.add(ext);
-                    i++;
-                }
+
+                ext.setType(mediaType.toString());
+
+                MediaDirection direction = stream.getDirection();
+
+                if (direction == null)
+                    direction = MediaDirection.INACTIVE;
+
+                ext.setStatus(direction.toString());
+                ret.add(ext);
+                i++;
             }
         }
 
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/MediaPacketExtension.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/MediaPacketExtension.java
index 19d4ea1..c8a2540 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/MediaPacketExtension.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/coin/MediaPacketExtension.java
@@ -93,6 +93,7 @@ public class MediaPacketExtension
     public MediaPacketExtension(String id)
     {
         super(NAMESPACE, ELEMENT_NAME);
+
         setAttribute(ID_ATTR_NAME, id);
     }
 
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java
index 0ca630e..bf562a1 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java
@@ -469,6 +469,7 @@ public class OperationSetTelephonyConferencingSipImpl
 
                 if (direction == null)
                     direction = MediaDirection.INACTIVE;
+
                 // <status>
                 append(xml, "<", ELEMENT_STATUS, ">");
                 xml.append(direction.toString());
diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
index 54f16e8..b09a824 100644
--- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
+++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java
@@ -444,9 +444,11 @@ public abstract class AbstractOperationSetTelephonyConferencing<
                     else if (ELEMENT_TYPE.equals(mediaChildName))
                     {
                         type = mediaChild.getTextContent();
-                        if ((srcId != null) && mediaTypeStr.equalsIgnoreCase(
-                                type))
+                        if ((srcId != null)
+                                && mediaTypeStr.equalsIgnoreCase(type))
+                        {
                             return srcId;
+                        }
                     }
                 }
             }