From 85f44f69a1741eef4f5be12a645660ce1abcdfa2 Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Fri, 26 Oct 2007 13:19:23 +0000
Subject: [PATCH] Committing a memory leak fix from Michael Koch - making sure
 that players are properly released after a call. (Issue #387)

---
 .../impl/media/CallSessionImpl.java           | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
index a56f7328f..c748a495f 100644
--- a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
+++ b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java
@@ -156,12 +156,13 @@ public class CallSessionImpl
      * @see #registerCustomCodecFormats(RTPManager)
      * @see MediaControl#registerCustomCodecs()
      */
-     private static final String[] CUSTOM_CODEC_FORMATS = new String[]
-     {
-         Constants.ILBC_RTP,
-         Constants.ALAW_RTP,
-         Constants.SPEEX_RTP
-     };
+    private static final javax.media.Format[] CUSTOM_CODEC_FORMATS 
+        = new javax.media.Format[] 
+    {
+        new AudioFormat(Constants.ILBC_RTP),
+        new AudioFormat(Constants.ALAW_RTP),
+        new AudioFormat(Constants.SPEEX_RTP)
+    };
 
     /**
      * Creates a new session for the specified <tt>call</tt> with a custom
@@ -1441,10 +1442,16 @@ static void registerCustomCodecFormats(RTPManager rtpManager)
     {
         for (int i=0; i<CUSTOM_CODEC_FORMATS.length; i++) 
         {
-            String format = CUSTOM_CODEC_FORMATS[i];
+            javax.media.Format format = CUSTOM_CODEC_FORMATS[i];
             logger.debug("registering format " + format + " with RTP manager");
+            /*
+             * NOTE (mkoch@rowa.de): com.sun.media.rtp.RtpSessionMgr.addFormat 
+             * leaks memory, since it stores the Format in a static Vector. 
+             * AFAIK there is no easy way around it, but the memory impact 
+             * should not be too bad.
+             */
             rtpManager.addFormat(
-                new AudioFormat(format), MediaUtils.jmfToSdpEncoding(format));
+                format, MediaUtils.jmfToSdpEncoding(format.getEncoding()));
         }
     }