Fix a problem when switch between camera and desktop streaming (and vice-versa), also change SSRC when we reconfigure stream.

8 files changed, 40 insertions, 20 deletions

diff --git a/src/net/java/sip/communicator/impl/neomedia/EncodingConfigurationTableModel.java b/src/net/java/sip/communicator/impl/neomedia/EncodingConfigurationTableModel.java
index 4931b03..ddd8e56 100644
--- a/src/net/java/sip/communicator/impl/neomedia/EncodingConfigurationTableModel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/EncodingConfigurationTableModel.java
@@ -23,6 +23,11 @@ import net.java.sip.communicator.service.neomedia.format.*;
 public class EncodingConfigurationTableModel

     extends AbstractTableModel

 {

+    /**

+     * Serial version UID.

+     */

+    private final long serialVersionUID = 0L;

+

     private final EncodingConfiguration encodingConfiguration;

 

     private MediaFormat[] encodings;

@@ -125,7 +130,7 @@ public class EncodingConfigurationTableModel
                                 /*

                                  * In the cases of equal priorities and equal

                                  * encoding names, display them sorted by clock

-                                 * rate in decreasing order.  

+                                 * rate in decreasing order.

                                  */

                                 ret

                                     = Double.compare(

diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
index 2bf01d2..8d73e21 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
@@ -1619,9 +1619,9 @@ public class MediaStreamImpl
                             = receiveStream.getDataSource();
 
                         /*
-                         * For an unknown reason, the stream DataSource can be null
-                         * at the end of the Call after re-INVITEs have been
-                         * handled.
+                         * For an unknown reason, the stream DataSource can be
+                         * null at the end of the Call after re-INVITEs have
+                         * been handled.
                          */
                         if (receiveStreamDataSource != null)
                             receiveStreamDataSource.start();
@@ -1848,16 +1848,17 @@ public class MediaStreamImpl
                             = receiveStream.getDataSource();
 
                         /*
-                         * For an unknown reason, the stream DataSource can be null
-                         * at the end of the Call after re-INVITEs have been
-                         * handled.
+                         * For an unknown reason, the stream DataSource can be
+                         * null at the end of the Call after re-INVITEs have
+                         * been handled.
                          */
                         if (receiveStreamDataSource != null)
                             receiveStreamDataSource.stop();
                     }
                     catch (IOException ioex)
                     {
-                        logger.warn("Failed to stop stream " + receiveStream, ioex);
+                        logger.warn("Failed to stop stream " + receiveStream,
+                                ioex);
                     }
                 }
             }
@@ -1975,7 +1976,8 @@ public class MediaStreamImpl
 
     /**
      * Notifies this <tt>ReceiveStreamListener</tt> that the <tt>RTPManager</tt>
-     * it is registered with has generated an event related to a <tt>ReceiveStream</tt>.
+     * it is registered with has generated an event related to a
+     * <tt>ReceiveStream</tt>.
      *
      * @param event the <tt>ReceiveStreamEvent</tt> which specifies the
      * <tt>ReceiveStream</tt> that is the cause of the event and the very type
@@ -2062,7 +2064,6 @@ public class MediaStreamImpl
         // TODO Auto-generated method stub
     }
 
-
     /**
      * Notifies this <tt>SessionListener</tt> that the <tt>RTPManager</tt> it is
      * registered with has generated an event which pertains to the session as a
@@ -2120,7 +2121,8 @@ public class MediaStreamImpl
                         new StringBuilder(StatisticsEngine.RTP_STAT_PREFIX);
 
                 buff.append("Received a report for ")
-                    .append(getFormat() != null ? getFormat().getMediaType().toString() : "")
+                    .append(getFormat() != null ?
+                            getFormat().getMediaType().toString() : "")
                     .append(" stream SSRC:")
                     .append(getLocalSourceID())
                     .append(" [packet count:")
diff --git a/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java b/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java
index f42ae00..06c902a 100644
--- a/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java
+++ b/src/net/java/sip/communicator/impl/neomedia/device/VideoMediaDeviceSession.java
@@ -34,7 +34,6 @@ import net.java.sip.communicator.util.*;
 public class VideoMediaDeviceSession
     extends MediaDeviceSession
 {
-
     /**
      * The <tt>Logger</tt> used by the <tt>VideoMediaDeviceSession</tt> class
      * and its instances for logging output.
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
index cc8cd68..6a39937 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerMediaHandlerJabberImpl.java
@@ -74,7 +74,7 @@ public class CallPeerMediaHandlerJabberImpl
      * Creates a new handler that will be managing media streams for
      * <tt>peer</tt>.
      *
-     * @param peer that <tt>CallPeerSipImpl</tt> instance that we will be
+     * @param peer that <tt>CallPeerJabberImpl</tt> instance that we will be
      * managing media for.
      */
     public CallPeerMediaHandlerJabberImpl(CallPeerJabberImpl peer)
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java b/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
index cf1da2e..f445a65 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/InfoRetreiver.java
@@ -46,7 +46,7 @@ public class InfoRetreiver
         this.jabberProvider = jabberProvider;
         this.ownerUin = ownerUin;
     }
-    
+
     /**
      * returns the user details from the specified class or its descendants
      * the class is one from the
@@ -284,6 +284,11 @@ public class InfoRetreiver
     public static class WorkDepartmentNameDetail
         extends ServerStoredDetails.NameDetail
     {
+        /**
+         * Constructor.
+         *
+         * @param workDepartmentName name of the work department
+         */
         public WorkDepartmentNameDetail(String workDepartmentName)
         {
             super("Work Department Name", workDepartmentName);
@@ -296,6 +301,11 @@ public class InfoRetreiver
     public static class WorkFaxDetail
         extends ServerStoredDetails.FaxDetail
     {
+        /**
+         * Constructor.
+         *
+         * @param number work fax number
+         */
         public WorkFaxDetail(String number)
         {
             super(number);
@@ -309,6 +319,11 @@ public class InfoRetreiver
     public static class WorkPagerDetail
         extends ServerStoredDetails.PhoneNumberDetail
     {
+        /**
+         * Constructor.
+         *
+         * @param number work pager number
+         */
         public WorkPagerDetail(String number)
         {
             super(number);
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
index e264395..85d38c6 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/JingleNodesHarvester.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.protocol.jabber;
 
-import java.net.DatagramSocket;
+import java.net.*;
 import java.util.*;
 
 import org.ice4j.*;
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 2f3bad7..d0837b3 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
@@ -367,17 +367,17 @@ public class OperationSetTelephonyConferencingJabberImpl
 
         if (registrationState == RegistrationState.REGISTERED)
         {
-            if(logger.isInfoEnabled())
+            if(logger.isDebugEnabled())
             {
-                logger.info("Subscribes to Coin packets");
+                logger.debug("Subscribes to Coin packets");
             }
             subscribeForCoinPackets();
         }
         else if (registrationState == RegistrationState.UNREGISTERED)
         {
-            if(logger.isInfoEnabled())
+            if(logger.isDebugEnabled())
             {
-                logger.info("Unsubscribes to Coin packets");
+                logger.debug("Unsubscribes to Coin packets");
             }
             unsubscribeForCoinPackets();
         }
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
index 3db9680..62a0fd2 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/UriHandlerJabberImpl.java
@@ -16,7 +16,6 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
-
 /**
  * The jabber implementation of the URI handler. This class handles xmpp URIs by
  * trying to establish a chat with them or add you to a chatroom.