From cc95a84f2eb8d6209ba51e05646b3edf3b7a1439 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Fri, 29 Jun 2012 08:16:43 +0000
Subject: [PATCH] Switches Jitsi trunk to libjitsi.
---
.../jitsi/impl/neomedia/MediaStreamImpl.java | 2 +-
.../jitsi/impl/neomedia/RTPTranslatorImpl.java | 4 ++--
src/org/jitsi/impl/neomedia/RecorderImpl.java | 3 ++-
.../jitsi/impl/neomedia/StreamRTPManager.java | 4 ++--
.../neomedia/ZrtpFortunaEntropyGatherer.java | 6 +++---
.../neomedia/codec/audio/alaw/DePacketizer.java | 3 ++-
.../neomedia/codec/audio/g729/JavaDecoder.java | 3 ++-
.../neomedia/codec/audio/g729/JavaEncoder.java | 3 ++-
.../impl/neomedia/codec/audio/gsm/Encoder.java | 5 ++---
.../neomedia/codec/audio/mp3/JNIEncoder.java | 1 +
.../neomedia/codec/audio/speex/JNIDecoder.java | 1 +
.../neomedia/codec/audio/speex/JNIEncoder.java | 1 +
.../neomedia/codec/audio/speex/JavaDecoder.java | 6 ++++--
.../neomedia/codec/audio/speex/JavaEncoder.java | 2 +-
.../codec/audio/speex/SpeexResampler.java | 1 +
.../neomedia/codec/audio/ulaw/JavaDecoder.java | 4 ++--
.../impl/neomedia/codec/video/ImageScaler.java | 14 +++++---------
.../neomedia/codec/video/h263p/Packetizer.java | 6 ++++--
.../neomedia/codec/video/h264/Packetizer.java | 9 ++++++---
.../impl/neomedia/conference/AudioMixer.java | 3 ++-
.../neomedia/device/AudioMixerMediaDevice.java | 2 +-
.../impl/neomedia/device/JavaSoundSystem.java | 2 +-
.../neomedia/device/MediaDeviceSession.java | 4 +++-
.../neomedia/format/MediaFormatFactoryImpl.java | 1 +
.../protocol/AbstractBufferCaptureDevice.java | 7 ++++---
.../RewritablePushBufferDataSource.java | 8 +++++---
.../transform/sdes/SDesControlImpl.java | 6 +++---
.../transform/sdes/SDesTransformEngine.java | 4 ++--
.../transform/srtp/SRTCPCryptoContext.java | 17 ++++++-----------
.../neomedia/transform/srtp/SRTPCipherCTR.java | 2 +-
.../neomedia/transform/srtp/SRTPCipherF8.java | 4 ++--
.../transform/srtp/SRTPCryptoContext.java | 5 ++---
.../ConfigVetoableChangeListener.java | 2 +-
.../service/neomedia/MediaStreamStats.java | 1 +
src/org/jitsi/service/neomedia/SDesControl.java | 2 +-
src/org/jitsi/service/neomedia/SrtpControl.java | 4 ++--
.../util/event/PropertyChangeNotifier.java | 2 +-
.../jitsi/util/event/VideoNotifierSupport.java | 3 ++-
38 files changed, 85 insertions(+), 72 deletions(-)
diff --git a/src/org/jitsi/impl/neomedia/MediaStreamImpl.java b/src/org/jitsi/impl/neomedia/MediaStreamImpl.java
index 2265eb48..30ad56b2 100644
--- a/src/org/jitsi/impl/neomedia/MediaStreamImpl.java
+++ b/src/org/jitsi/impl/neomedia/MediaStreamImpl.java
@@ -6,10 +6,10 @@
*/
package org.jitsi.impl.neomedia;
+import java.beans.*;
import java.io.*;
import java.net.*;
import java.util.*;
-import java.beans.*;
import javax.media.*;
import javax.media.control.*;
diff --git a/src/org/jitsi/impl/neomedia/RTPTranslatorImpl.java b/src/org/jitsi/impl/neomedia/RTPTranslatorImpl.java
index 9277c430..d03ef4ef 100644
--- a/src/org/jitsi/impl/neomedia/RTPTranslatorImpl.java
+++ b/src/org/jitsi/impl/neomedia/RTPTranslatorImpl.java
@@ -17,11 +17,11 @@
import javax.media.rtp.event.*;
import javax.media.rtp.rtcp.*;
-import com.sun.media.rtp.*;
-
import org.jitsi.service.neomedia.*;
import org.jitsi.util.*;
+import com.sun.media.rtp.*;
+
/**
* Implements <tt>RTPTranslator</tt> which represents an RTP translator which
* forwards RTP and RTCP traffic between multiple <tt>MediaStream</tt>s.
diff --git a/src/org/jitsi/impl/neomedia/RecorderImpl.java b/src/org/jitsi/impl/neomedia/RecorderImpl.java
index 239c782a..49baa336 100644
--- a/src/org/jitsi/impl/neomedia/RecorderImpl.java
+++ b/src/org/jitsi/impl/neomedia/RecorderImpl.java
@@ -14,8 +14,9 @@
import org.jitsi.impl.neomedia.device.*;
import org.jitsi.service.neomedia.*;
-import org.jitsi.service.neomedia.MediaException; // disambiguation
+import org.jitsi.service.neomedia.MediaException;
import org.jitsi.util.*;
+// disambiguation
/**
* The call recording implementation.
diff --git a/src/org/jitsi/impl/neomedia/StreamRTPManager.java b/src/org/jitsi/impl/neomedia/StreamRTPManager.java
index 56206b99..e8a7804f 100644
--- a/src/org/jitsi/impl/neomedia/StreamRTPManager.java
+++ b/src/org/jitsi/impl/neomedia/StreamRTPManager.java
@@ -14,10 +14,10 @@
import javax.media.protocol.*;
import javax.media.rtp.*;
-import com.sun.media.rtp.*;
-
import org.jitsi.service.neomedia.*;
+import com.sun.media.rtp.*;
+
/**
* Implements the <tt>RTPManager</tt> interface as used by a
* <tt>MediaStream</tt>.
diff --git a/src/org/jitsi/impl/neomedia/ZrtpFortunaEntropyGatherer.java b/src/org/jitsi/impl/neomedia/ZrtpFortunaEntropyGatherer.java
index 832ccfeb..9e91e6d2 100644
--- a/src/org/jitsi/impl/neomedia/ZrtpFortunaEntropyGatherer.java
+++ b/src/org/jitsi/impl/neomedia/ZrtpFortunaEntropyGatherer.java
@@ -6,15 +6,15 @@
*/
package org.jitsi.impl.neomedia;
+import gnu.java.zrtp.utils.*;
+
import java.io.*;
import javax.media.*;
-import javax.media.control.FormatControl;
+import javax.media.control.*;
import javax.media.format.*;
import javax.media.protocol.*;
-import gnu.java.zrtp.utils.*;
-
import org.jitsi.impl.neomedia.device.*;
import org.jitsi.util.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java b/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
index 646c3616..df03ddac 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/alaw/DePacketizer.java
@@ -9,9 +9,10 @@
import javax.media.*;
import javax.media.format.*;
-import com.sun.media.codec.audio.*;
import org.jitsi.impl.neomedia.codec.*;
+import com.sun.media.codec.audio.*;
+
/**
* DePacketizer for ALAW codec
* @author Damian Minkov
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
index c73c78d1..0da684de 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
@@ -9,9 +9,10 @@
import javax.media.*;
import javax.media.format.*;
+import net.sf.fmj.media.*;
+
import org.jitsi.impl.neomedia.*;
import org.jitsi.impl.neomedia.codec.*;
-import net.sf.fmj.media.*;
/**
* @author Lubomir Marinov
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaEncoder.java
index 09599d29..4d55e9ee 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaEncoder.java
@@ -11,9 +11,10 @@
import javax.media.*;
import javax.media.format.*;
+import net.sf.fmj.media.*;
+
import org.jitsi.impl.neomedia.*;
import org.jitsi.impl.neomedia.codec.*;
-import net.sf.fmj.media.*;
/**
* @author Lubomir Marinov
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/gsm/Encoder.java b/src/org/jitsi/impl/neomedia/codec/audio/gsm/Encoder.java
index 52efd6e8..f50e27d5 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/gsm/Encoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/gsm/Encoder.java
@@ -6,12 +6,11 @@
*/
package org.jitsi.impl.neomedia.codec.audio.gsm;
-import net.sf.fmj.media.*;
-
import javax.media.*;
-import javax.media.Format;
import javax.media.format.*;
+import net.sf.fmj.media.*;
+
/**
* GSM encoder Codec. Encodes 160 16-bit PCM samples into array of
* 33 bytes (GSM frame).
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/mp3/JNIEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/mp3/JNIEncoder.java
index 5d155784..a64fd007 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/mp3/JNIEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/mp3/JNIEncoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import net.java.sip.communicator.impl.neomedia.codec.*;
+import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
import org.jitsi.util.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
index a3d35250..c43bfa66 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIDecoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import net.java.sip.communicator.impl.neomedia.codec.audio.speex.*;
+import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
index ca3e08c0..c9ae3b6d 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JNIEncoder.java
@@ -10,6 +10,7 @@
import javax.media.format.*;
import net.java.sip.communicator.impl.neomedia.codec.audio.speex.*;
+import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
index 9aba12f9..3d9883ee 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaDecoder.java
@@ -7,13 +7,15 @@
package org.jitsi.impl.neomedia.codec.audio.speex;
import java.io.*;
+
import javax.media.*;
import javax.media.format.*;
-import org.xiph.speex.*;
-import org.jitsi.impl.neomedia.codec.*;
import net.sf.fmj.media.*;
+import org.jitsi.impl.neomedia.codec.*;
+import org.xiph.speex.*;
+
/**
* Speex to PCM java decoder
* @author Damian Minkov
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
index 4ec49832..220f969a 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/JavaEncoder.java
@@ -9,9 +9,9 @@
import javax.media.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.codec.*;
import net.sf.fmj.media.*;
+import org.jitsi.impl.neomedia.codec.*;
import org.xiph.speex.*;
/**
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/speex/SpeexResampler.java b/src/org/jitsi/impl/neomedia/codec/audio/speex/SpeexResampler.java
index 14da50bf..ebab81a2 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/speex/SpeexResampler.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/speex/SpeexResampler.java
@@ -12,6 +12,7 @@
import javax.media.format.*;
import net.java.sip.communicator.impl.neomedia.codec.audio.speex.*;
+import net.sf.fmj.media.*;
import org.jitsi.impl.neomedia.codec.*;
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/ulaw/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/ulaw/JavaDecoder.java
index 26e004c3..537e456c 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/ulaw/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/ulaw/JavaDecoder.java
@@ -5,11 +5,11 @@
*/
package org.jitsi.impl.neomedia.codec.audio.ulaw;
-import com.sun.media.controls.*;
-
import javax.media.*;
import javax.media.format.*;
+import com.sun.media.controls.*;
+
public class JavaDecoder
extends com.ibm.media.codec.audio.AudioCodec
{
diff --git a/src/org/jitsi/impl/neomedia/codec/video/ImageScaler.java b/src/org/jitsi/impl/neomedia/codec/video/ImageScaler.java
index 64f3d4a7..066eab67 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/ImageScaler.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/ImageScaler.java
@@ -9,15 +9,11 @@
import java.awt.*;
import java.awt.image.*;
-import javax.media.Buffer;
-import javax.media.Codec;
-import javax.media.Format;
-import javax.media.format.RGBFormat;
-import javax.media.format.VideoFormat;
-
-import net.sf.fmj.media.AbstractCodec;
-import net.sf.fmj.media.util.BufferToImage;
-import net.sf.fmj.media.util.ImageToBuffer;
+import javax.media.*;
+import javax.media.format.*;
+
+import net.sf.fmj.media.*;
+import net.sf.fmj.media.util.*;
/**
* Codec that scales images from one size to another.
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java b/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
index bcd9e260..31260b43 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h263p/Packetizer.java
@@ -8,14 +8,16 @@
import java.awt.*;
import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
import javax.media.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.codec.*;
import net.sf.fmj.media.*;
+import org.jitsi.impl.neomedia.codec.*;
+// disambiguation
+
/**
* Packetizes H.263+ encoded data into RTP packets in accord with RFC 4529
* "RTP Payload Format for ITU-T Rec. H.263 Video".
diff --git a/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java b/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
index 6d933a34..5c5978c9 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/h264/Packetizer.java
@@ -6,16 +6,19 @@
*/
package org.jitsi.impl.neomedia.codec.video.h264;
-import java.awt.Dimension; // disambiguation
+import java.awt.*;
import java.util.*;
+import java.util.List;
import javax.media.*;
import javax.media.format.*;
-import org.jitsi.impl.neomedia.format.*;
-import org.jitsi.impl.neomedia.codec.*;
import net.sf.fmj.media.*;
+import org.jitsi.impl.neomedia.codec.*;
+import org.jitsi.impl.neomedia.format.*;
+// disambiguation
+
/**
* Packetizes H.264 encoded data/NAL units into RTP packets in accord with RFC
* 3984 "RTP Payload Format for H.264 Video".
diff --git a/src/org/jitsi/impl/neomedia/conference/AudioMixer.java b/src/org/jitsi/impl/neomedia/conference/AudioMixer.java
index c79c3928..7954fabb 100644
--- a/src/org/jitsi/impl/neomedia/conference/AudioMixer.java
+++ b/src/org/jitsi/impl/neomedia/conference/AudioMixer.java
@@ -11,7 +11,7 @@
import java.util.*;
import javax.media.*;
-import javax.media.Controls; // disambiguation
+import javax.media.Controls;
import javax.media.control.*;
import javax.media.format.*;
import javax.media.protocol.*;
@@ -21,6 +21,7 @@
import org.jitsi.impl.neomedia.device.*;
import org.jitsi.impl.neomedia.protocol.*;
import org.jitsi.util.*;
+// disambiguation
/**
* Represents an audio mixer which manages the mixing of multiple audio streams
diff --git a/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java b/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
index c2612af6..7ce90c42 100644
--- a/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
+++ b/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
@@ -6,10 +6,10 @@
*/
package org.jitsi.impl.neomedia.device;
+import java.beans.*;
import java.io.*;
import java.net.*;
import java.util.*;
-import java.beans.*;
import javax.media.*;
import javax.media.protocol.*;
diff --git a/src/org/jitsi/impl/neomedia/device/JavaSoundSystem.java b/src/org/jitsi/impl/neomedia/device/JavaSoundSystem.java
index 6cad0a01..e83a1ae9 100644
--- a/src/org/jitsi/impl/neomedia/device/JavaSoundSystem.java
+++ b/src/org/jitsi/impl/neomedia/device/JavaSoundSystem.java
@@ -6,7 +6,7 @@
*/
package org.jitsi.impl.neomedia.device;
-import java.lang.reflect.Method;
+import java.lang.reflect.*;
/**
* Auto-detection of FMJ audio capture devices.
diff --git a/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java b/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
index 58c0a8b6..e56d54a6 100644
--- a/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
+++ b/src/org/jitsi/impl/neomedia/device/MediaDeviceSession.java
@@ -6,9 +6,10 @@
*/
package org.jitsi.impl.neomedia.device;
-import java.awt.Dimension; // disambiguation
+import java.awt.*;
import java.io.*;
import java.util.*;
+import java.util.List;
import javax.media.*;
import javax.media.control.*;
@@ -25,6 +26,7 @@
import org.jitsi.service.neomedia.format.*;
import org.jitsi.util.*;
import org.jitsi.util.event.*;
+// disambiguation
/**
* Represents the use of a specific <tt>MediaDevice</tt> by a
diff --git a/src/org/jitsi/impl/neomedia/format/MediaFormatFactoryImpl.java b/src/org/jitsi/impl/neomedia/format/MediaFormatFactoryImpl.java
index e874d17b..b2f9f82f 100644
--- a/src/org/jitsi/impl/neomedia/format/MediaFormatFactoryImpl.java
+++ b/src/org/jitsi/impl/neomedia/format/MediaFormatFactoryImpl.java
@@ -7,6 +7,7 @@
package org.jitsi.impl.neomedia.format;
import java.util.*;
+
import javax.media.*;
import javax.media.format.*;
diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/AbstractBufferCaptureDevice.java b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/AbstractBufferCaptureDevice.java
index 10ccea9a..e6e46503 100644
--- a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/AbstractBufferCaptureDevice.java
+++ b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/AbstractBufferCaptureDevice.java
@@ -11,14 +11,15 @@
import java.util.*;
import javax.media.*;
-import javax.media.Controls; // disambiguation
+import javax.media.Controls;
import javax.media.control.*;
import javax.media.protocol.*;
+import net.sf.fmj.media.util.*;
+
import org.jitsi.impl.neomedia.control.*;
import org.jitsi.util.*;
-
-import net.sf.fmj.media.util.*;
+// disambiguation
/**
* Facilitates the implementations of the <tt>CaptureDevice</tt> and
diff --git a/src/org/jitsi/impl/neomedia/protocol/RewritablePushBufferDataSource.java b/src/org/jitsi/impl/neomedia/protocol/RewritablePushBufferDataSource.java
index 2f8687d9..b837faf0 100644
--- a/src/org/jitsi/impl/neomedia/protocol/RewritablePushBufferDataSource.java
+++ b/src/org/jitsi/impl/neomedia/protocol/RewritablePushBufferDataSource.java
@@ -7,16 +7,18 @@
package org.jitsi.impl.neomedia.protocol;
import java.io.*;
-import java.nio.ByteBuffer; // disambiguation.
-import java.nio.ByteOrder; // disambiguation.
-import java.nio.IntBuffer; // disambiguation.
+import java.nio.*;
import java.util.*;
import javax.media.*;
+import javax.media.Buffer;
import javax.media.format.*;
import javax.media.protocol.*;
import org.jitsi.service.neomedia.*;
+// disambiguation.
+// disambiguation.
+// disambiguation.
/**
* Implements a <tt>PushBufferDataSource</tt> wrapper which provides mute
diff --git a/src/org/jitsi/impl/neomedia/transform/sdes/SDesControlImpl.java b/src/org/jitsi/impl/neomedia/transform/sdes/SDesControlImpl.java
index 80732da3..c9b9c36e 100644
--- a/src/org/jitsi/impl/neomedia/transform/sdes/SDesControlImpl.java
+++ b/src/org/jitsi/impl/neomedia/transform/sdes/SDesControlImpl.java
@@ -6,18 +6,18 @@
*/
package org.jitsi.impl.neomedia.transform.sdes;
-import gnu.java.zrtp.utils.ZrtpFortuna;
+import gnu.java.zrtp.utils.*;
import java.util.*;
-import ch.imvs.sdes4j.srtp.*;
-
import org.jitsi.impl.neomedia.*;
import org.jitsi.impl.neomedia.transform.*;
import org.jitsi.impl.neomedia.transform.zrtp.*;
import org.jitsi.service.neomedia.*;
import org.jitsi.service.neomedia.event.*;
+import ch.imvs.sdes4j.srtp.*;
+
/**
* Default implementation of {@link SDesControl} that supports the crypto suites
* of the original RFC4568 and the KDR parameter, but nothing else.
diff --git a/src/org/jitsi/impl/neomedia/transform/sdes/SDesTransformEngine.java b/src/org/jitsi/impl/neomedia/transform/sdes/SDesTransformEngine.java
index fb7687ee..38953263 100644
--- a/src/org/jitsi/impl/neomedia/transform/sdes/SDesTransformEngine.java
+++ b/src/org/jitsi/impl/neomedia/transform/sdes/SDesTransformEngine.java
@@ -6,10 +6,10 @@
*/
package org.jitsi.impl.neomedia.transform.sdes;
-import ch.imvs.sdes4j.srtp.*;
-
import org.jitsi.impl.neomedia.transform.srtp.*;
+import ch.imvs.sdes4j.srtp.*;
+
/**
* PacketTransformer for SDES based SRTP encryption.
*
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java b/src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java
index 7b2ad445..92be1403 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/SRTCPCryptoContext.java
@@ -26,19 +26,14 @@
*/
package org.jitsi.impl.neomedia.transform.srtp;
-import java.util.Arrays;
+import java.util.*;
-import org.jitsi.impl.neomedia.*;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
+import org.bouncycastle.crypto.*;
+import org.bouncycastle.crypto.digests.*;
+import org.bouncycastle.crypto.engines.*;
import org.bouncycastle.crypto.macs.*;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersForSkein;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Mac;
-
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
+import org.bouncycastle.crypto.params.*;
+import org.jitsi.impl.neomedia.*;
/**
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherCTR.java b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherCTR.java
index a27c7038..9d981745 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherCTR.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherCTR.java
@@ -25,7 +25,7 @@
*/
package org.jitsi.impl.neomedia.transform.srtp;
-import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.*;
/**
* SRTPCipherCTR implements SRTP Counter Mode AES Encryption (AES-CM).
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherF8.java b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherF8.java
index a53216ec..932f8e65 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherF8.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCipherF8.java
@@ -27,8 +27,8 @@
import java.util.*;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.*;
+import org.bouncycastle.crypto.params.*;
/**
* SRTPCipherF8 implements SRTP F8 Mode AES Encryption (AES-f8).
diff --git a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java
index 914a9fe2..5e110197 100644
--- a/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java
+++ b/src/org/jitsi/impl/neomedia/transform/srtp/SRTPCryptoContext.java
@@ -26,15 +26,14 @@
*/
package org.jitsi.impl.neomedia.transform.srtp;
-import java.util.Arrays;
-
-import org.jitsi.impl.neomedia.*;
+import java.util.*;
import org.bouncycastle.crypto.*;
import org.bouncycastle.crypto.digests.*;
import org.bouncycastle.crypto.engines.*;
import org.bouncycastle.crypto.macs.*;
import org.bouncycastle.crypto.params.*;
+import org.jitsi.impl.neomedia.*;
/**
* SRTPCryptoContext class is the core class of SRTP implementation.
diff --git a/src/org/jitsi/service/configuration/ConfigVetoableChangeListener.java b/src/org/jitsi/service/configuration/ConfigVetoableChangeListener.java
index 674db504..cf3a12b5 100644
--- a/src/org/jitsi/service/configuration/ConfigVetoableChangeListener.java
+++ b/src/org/jitsi/service/configuration/ConfigVetoableChangeListener.java
@@ -7,7 +7,7 @@
package org.jitsi.service.configuration;
import java.beans.*;
-import java.util.EventListener;
+import java.util.*;
/**
* This interface uses SC's own ProperteyVetoException.
diff --git a/src/org/jitsi/service/neomedia/MediaStreamStats.java b/src/org/jitsi/service/neomedia/MediaStreamStats.java
index 251f37c3..dc76236d 100644
--- a/src/org/jitsi/service/neomedia/MediaStreamStats.java
+++ b/src/org/jitsi/service/neomedia/MediaStreamStats.java
@@ -7,6 +7,7 @@
package org.jitsi.service.neomedia;
import java.awt.*;
+
import net.sf.fmj.media.rtp.*;
/**
diff --git a/src/org/jitsi/service/neomedia/SDesControl.java b/src/org/jitsi/service/neomedia/SDesControl.java
index 6b72764f..c7875f15 100644
--- a/src/org/jitsi/service/neomedia/SDesControl.java
+++ b/src/org/jitsi/service/neomedia/SDesControl.java
@@ -6,7 +6,7 @@
*/
package org.jitsi.service.neomedia;
-import ch.imvs.sdes4j.srtp.SrtpCryptoAttribute;
+import ch.imvs.sdes4j.srtp.*;
/**
* SDES based SRTP MediaStream encryption control.
diff --git a/src/org/jitsi/service/neomedia/SrtpControl.java b/src/org/jitsi/service/neomedia/SrtpControl.java
index 622aff22..97c7b2ba 100644
--- a/src/org/jitsi/service/neomedia/SrtpControl.java
+++ b/src/org/jitsi/service/neomedia/SrtpControl.java
@@ -6,8 +6,8 @@
*/
package org.jitsi.service.neomedia;
-import org.jitsi.impl.neomedia.AbstractRTPConnector;
-import org.jitsi.impl.neomedia.transform.TransformEngine;
+import org.jitsi.impl.neomedia.*;
+import org.jitsi.impl.neomedia.transform.*;
import org.jitsi.service.neomedia.event.*;
/**
diff --git a/src/org/jitsi/util/event/PropertyChangeNotifier.java b/src/org/jitsi/util/event/PropertyChangeNotifier.java
index 03547b71..e1555885 100644
--- a/src/org/jitsi/util/event/PropertyChangeNotifier.java
+++ b/src/org/jitsi/util/event/PropertyChangeNotifier.java
@@ -6,8 +6,8 @@
*/
package org.jitsi.util.event;
-import java.util.*;
import java.beans.*;
+import java.util.*;
/**
* Represents a source of <tt>PropertyChangeEvent</tt>s which notifies
diff --git a/src/org/jitsi/util/event/VideoNotifierSupport.java b/src/org/jitsi/util/event/VideoNotifierSupport.java
index 5bd98437..ca376852 100644
--- a/src/org/jitsi/util/event/VideoNotifierSupport.java
+++ b/src/org/jitsi/util/event/VideoNotifierSupport.java
@@ -8,7 +8,8 @@
import java.awt.*;
import java.util.*;
-import java.util.List; // disambiguation
+import java.util.List;
+// disambiguation
/**
* Represents a mechanism to easily add to a specific <tt>Object</tt> by means
--
GitLab