Adds log entries when a Cobri (Colibri) channel's SSRCs change. Minor corrections to comments and logging.

src/net/java/sip/communicator/impl/protocol/jabber/AbstractCallPeerJabberGTalkImpl.java

@@ -41,7 +41,7 @@ public abstract class AbstractCallPeerJabberGTalkImpl
     private DiscoverInfo discoverInfo;
 
     /**
-     * The indicator which determines whether this peer was initiated the
+     * The indicator which determines whether this peer has initiated the
      * session.
      */
     protected boolean initiator = false;

src/net/java/sip/communicator/impl/protocol/jabber/CallJabberImpl.java

@@ -51,6 +51,9 @@ public class CallJabberImpl
      */
     private MediaHandler cobriMediaHandler;
 
+    /**
+     * Contains one CobriStreamConnector for each <tt>MediaType</tt>
+     */
     private final List<WeakReference<CobriStreamConnector>>
         cobriStreamConnectors;
 

src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java

@@ -437,17 +437,10 @@ public void processContentAdd(final JingleIQ content)
         Iterable<ContentPacketExtension> answerContents;
         JingleIQ contentIQ;
         boolean noCands = false;
-
-        logger.info("nocand " + noCands);
-        logger.info("run code");
-
-        /*
-         * If a remote peer turns her video on in a conference which is hosted
-         * by the local peer and the local peer is not streaming her local
-         * video, reinvite the other remote peers to enable RTP translation.
-         */
         MediaStream oldVideoStream = mediaHandler.getStream(MediaType.VIDEO);
 
+        if(logger.isInfoEnabled())
+            logger.info("Looking for candidates in content-add.");
         try
         {
             if(!contentAddWithNoCands)
@@ -494,13 +487,16 @@ public void run()
                         contentAddWithNoCands = false;
                     }
                 }.start();
-                logger.info("start thread");
+                if(logger.isInfoEnabled())
+                    logger.info("No candidates found in content-add, started "
+                                + "new thread.");
                 return;
             }
 
             mediaHandler.getTransportManager().
                 wrapupConnectivityEstablishment();
-            logger.info("wraping up");
+            if(logger.isInfoEnabled())
+                logger.info("Wrapping up connectivity establishment");
             answerContents = mediaHandler.generateSessionAccept();
             contentIQ = null;
         }

src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java

@@ -1247,9 +1247,19 @@ void processCobriConferenceIQ(CobriConferenceIQ conferenceIQ)
                         if (src != null)
                         {
                             long[] ssrcs = src.getSSRCs();
+                            long[] dstSsrcs = dst.getSSRCs();
 
-                            if (!Arrays.equals(dst.getSSRCs(), ssrcs))
-                                dst.setSSRCs(src.getSSRCs());
+                            if (!Arrays.equals(dstSsrcs, ssrcs))
+                            {
+                                dst.setSSRCs(ssrcs);
+                                if(logger.isDebugEnabled())
+                                {
+                                    logger.debug("SSRCs changed for colibri "
+                                            + mediaType.toString() + " channel "
+                                            + dst.getID() + ". From: "
+                                            + dstSsrcs + ", to: " + ssrcs);
+                                }
+                            }
                         }
                     }
                 }

src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java

@@ -219,7 +219,7 @@ public Call createCall(String callee, CallConference conference)
         throws OperationFailedException
     {
         if (logger.isInfoEnabled())
-            logger.info("creating outgoing call...");
+            logger.info("Creating outgoing call to " + calleeAddress);
         if (protocolProvider.getConnection() == null || call == null)
         {
             throw new OperationFailedException(
@@ -420,7 +420,8 @@ else if(di != null)
         }
 
         if(logger.isInfoEnabled())
-            logger.info("Choose one is: " + fullCalleeURI + " " + bestPriority);
+            logger.info("Full JID for outgoing call: " + fullCalleeURI
+                            + ", priority " + bestPriority);
 
         AbstractCallPeer<?, ?> peer = null;
 

src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java

@@ -279,7 +279,7 @@ public void videoUpdate(VideoEvent ev)
      * Creates a new handler that will be managing media streams for
      * <tt>peer</tt>.
      *
-     * @param peer that <tt>CallPeer</tt> instance that we will be managing
+     * @param peer the <tt>CallPeer</tt> instance that we will be managing
      * media for.
      * @param srtpListener the object that receives SRTP security events.
      */