[jitsi~svn:10186] Sync with Jitsi r10185.

jitsi-android-sync at java.net jitsi-android-sync at java.net
Fri Dec 14 18:33:53 CET 2012


Project:    jitsi
Repository: svn
Revision:   10186
Author:     jitsi-android-sync
Date:       2012-12-14 17:33:51 UTC
Link:       

Log Message:
------------
Sync with Jitsi r10185. 
Updates FMJ to r11. This revision uses an adaptive jitter buffer (for audio streams), which changes size according to the number of packets arriving too late. Passes the net.java.sip.communicator.impl.neomedia.adaptive_jitter_buffer.* properties to the FMJ Registry. Changes the mechanism through which the number of discarded packets is obtained in MediaStreamStatsImpl, now using a FMJ controls. Shows more information about discarded packets and the adaptive jitter buffer in the "call info" window.
Changes the check for valid capabilities on discovering info, on not valid one we can end up with infinite loop querying server for discovery info.
Updates FMJ and FMJ sources to r12 (which includes a minor change in the way late RTP audio packets are handled)




Revisions:
----------
10186


Modified Paths:
---------------
jitsi-android/lib/installer-exclude/fmj.jar
jitsi-android/lib/installer-exclude/libjitsi.jar
jitsi-android
jitsi-android/src/net/java/sip/communicator/impl/protocol/jabber/ScServiceDiscoveryManager.java


Diffs:
------
Index: jitsi-android/src/net/java/sip/communicator/impl/protocol/jabber/ScServiceDiscoveryManager.java
===================================================================
--- jitsi-android/src/net/java/sip/communicator/impl/protocol/jabber/ScServiceDiscoveryManager.java	(revision 10185)
+++ jitsi-android/src/net/java/sip/communicator/impl/protocol/jabber/ScServiceDiscoveryManager.java	(revision 10186)
@@ -471,7 +471,7 @@
         EntityCapsManager.Caps caps = capsManager.getCapsByUser(entityID);
 
         // if caps is not valid, has empty hash
-        if (CACHE_NON_CAPS && (caps == null || caps.hash.equals("")))
+        if (CACHE_NON_CAPS && (caps == null || !caps.isValid(discoverInfo)))
         {
             discoverInfo = nonCapsCache.get(entityID);
             if (discoverInfo != null)
@@ -523,7 +523,7 @@
         EntityCapsManager.Caps caps = capsManager.getCapsByUser(entityID);
 
         // if caps is not valid, has empty hash
-        if (CACHE_NON_CAPS && (caps == null || caps.hash.equals("")))
+        if (CACHE_NON_CAPS && (caps == null || !caps.isValid(discoverInfo)))
         {
             discoverInfo = nonCapsCache.get(entityID);
             if (discoverInfo != null)
Index: jitsi-android/lib/installer-exclude/libjitsi.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: jitsi-android/lib/installer-exclude/fmj.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: jitsi-android
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r10182-10185








More information about the commits mailing list