From b7f719e8b4f7c25ad163991e5f335c81904ffec8 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Thu, 29 Apr 2010 11:10:09 +0000
Subject: [PATCH] - Change ulaw packetization to 20 ms. - Remove wrong setting
 of multi stream data when recreating Zrtp Control.

---
 .../impl/neomedia/MediaStreamImpl.java           |  3 ---
 .../impl/neomedia/ZrtpControlImpl.java           | 16 ----------------
 .../neomedia/codec/audio/ulaw/Packetizer.java    |  3 ++-
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
index 7b5cb4197..efbbbd5e5 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
@@ -900,9 +900,6 @@ public ZrtpControl restartZrtpControl()
 
         if(oldZrtpControl != null)
         {
-            if(oldZrtpControl.getMultiStrParams() != null)
-                zrtpControl.setMultistream(oldZrtpControl.getMultiStrParams());
-
             ZRTPTransformEngine engine = oldZrtpControl.getZrtpEngine();
 
             if(engine != null)
diff --git a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
index c4ab61aeb..0a9c606f0 100644
--- a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java
@@ -28,11 +28,6 @@ public class ZrtpControlImpl
      */
     private ZrtpListener zrtpListener = null;
 
-    /**
-     * The current multi-stream data if any.
-     */
-    private byte[] multiStreamData = null;
-
     /**
      * Additional info codes for and data to support ZRTP4J.
      * These could be added to the library. However they are specific for this
@@ -205,21 +200,10 @@ public void start(boolean masterSession)
     public void setMultistream(byte[] multiStreamData)
     {
         ZRTPTransformEngine engine = getZrtpEngine();
-        this.multiStreamData = multiStreamData;
         engine.setMultiStrParams(multiStreamData);
         engine.setEnableZrtp(true);
     }
 
-    /**
-     * Gets the multistream params
-     *
-     * @return the multistream params
-     */
-    public byte[] getMultiStrParams()
-    {
-        return multiStreamData;
-    }
-
     /**
      * Return the zrtp hello hash String.
      *
diff --git a/src/net/java/sip/communicator/impl/neomedia/codec/audio/ulaw/Packetizer.java b/src/net/java/sip/communicator/impl/neomedia/codec/audio/ulaw/Packetizer.java
index e99a19f32..cd4e3e6bc 100644
--- a/src/net/java/sip/communicator/impl/neomedia/codec/audio/ulaw/Packetizer.java
+++ b/src/net/java/sip/communicator/impl/neomedia/codec/audio/ulaw/Packetizer.java
@@ -19,7 +19,8 @@ public class Packetizer
     public Packetizer()
     {
         super();
-        packetSize = 240;
+        // RFC 3551 4.5 Audio Encodings default ms/packet is 20
+        packetSize = 160;
         setPacketSize(packetSize);
         
         // Workaround to use our ulaw packetizer