aboutsummaryrefslogtreecommitdiffstats
path: root/src/net
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2009-11-30 12:07:37 +0000
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2009-11-30 12:07:37 +0000
commit8672fbb29f5c22354156a9a7a5a42866738687ce (patch)
treee833a302cb9433dc0d854d340dfa9a36cc3c4d85 /src/net
parenta20e2967286581bdb15c66d33070374ce2c7e0f5 (diff)
downloadjitsi-8672fbb29f5c22354156a9a7a5a42866738687ce.zip
jitsi-8672fbb29f5c22354156a9a7a5a42866738687ce.tar.gz
jitsi-8672fbb29f5c22354156a9a7a5a42866738687ce.tar.bz2
Reverts AudioMixerMediaDevice#getSupportedExtensions() because I incorrectly deleted it in my previous commit. Reported by Emil Ivov.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java32
1 files changed, 30 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java b/src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java
index 77f2809..d85996d 100644
--- a/src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java
+++ b/src/net/java/sip/communicator/impl/neomedia/device/AudioMixerMediaDevice.java
@@ -7,6 +7,7 @@
package net.java.sip.communicator.impl.neomedia.device;
import java.io.*;
+import java.net.*;
import java.util.*;
import javax.media.*;
@@ -71,6 +72,13 @@ public class AudioMixerMediaDevice
private LocalSliEventDispatcher localEventsDispatcher = null;
/**
+ * The <tt>List</tt> of RTP extensions supported by this device (at the time
+ * of writing this list is only filled for audio devices and is
+ * <tt>null</tt> otherwise).
+ */
+ private List<RTPExtension> rtpExtensions = null;
+
+ /**
* Mapping between threads dispatching events and received streams.
* Those threads contain the listeners that are interested for sound level
* changes of the particular received stream.
@@ -171,10 +179,30 @@ public class AudioMixerMediaDevice
* @return a <tt>List</tt> containing the <tt>CSRC_AUDIO_LEVEL_URN</tt>
* extension descriptor.
*/
- @Override
public List<RTPExtension> getSupportedExtensions()
{
- return device.getSupportedExtensions();
+ if ( rtpExtensions == null)
+ {
+ rtpExtensions = new ArrayList<RTPExtension>(1);
+
+ URI csrcAudioLevelURN;
+ try
+ {
+ csrcAudioLevelURN = new URI(RTPExtension.CSRC_AUDIO_LEVEL_URN);
+ }
+ catch (URISyntaxException e)
+ {
+ // can't happen since CSRC_AUDIO_LEVEL_URN is a valid URI and
+ // never changes.
+ logger.info("Aha! Someone messed with the source!", e);
+ return null;
+ }
+
+ rtpExtensions.add(new RTPExtension(
+ csrcAudioLevelURN, MediaDirection.SENDRECV));
+ }
+
+ return rtpExtensions;
}
/**