sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Stop building media bundler. Remove media bundle from starting in client and in tests. Comment all code that access media service in jabber protocol.

Browse Source
cusax-fix
Damian Minkov 16 years ago
parent 97634e712a
commit 9705865983
11 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File

2
build.xml
Unescape View File

@ -807,7 +807,7 @@
bundle-callhistory, bundle-callhistory-slick, bundle-popupmessagehandler-slick,
bundle-netaddr,bundle-netaddr-slick,bundle-slickless,
bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess,
bundle-fileaccess-slick,bundle-media,bundle-neomedia,bundle-media-slick,
bundle-fileaccess-slick,bundle-neomedia,
bundle-resource-manager,bundle-resources-defaultpack,
bundle-protocol,bundle-icq,bundle-icq-slick,bundle-mock,bundle-smacklib,
bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service,

1
lib/felix.client.run.properties
Unescape View File

@ -104,7 +104,6 @@ felix.auto.start.50= \
reference:file:sc-bundles/contactlist.jar
felix.auto.start.52= \
reference:file:sc-bundles/media.jar \
reference:file:sc-bundles/neomedia.jar \
reference:file:sc-bundles/protocol-icq.jar \
reference:file:sc-bundles/protocol-sip.jar \

3
lib/felix.unit.test.properties
Unescape View File

@ -106,7 +106,7 @@ felix.auto.start.6= \
reference:file:sc-bundles/protocol-icq.jar \
reference:file:sc-bundles/smacklib.jar \
reference:file:sc-bundles/protocol-rss.jar \
reference:file:sc-bundles/media.jar \
reference:file:sc-bundles/neomedia.jar \
reference:file:sc-bundles/protocol-jabber.jar \
reference:file:sc-bundles/protocol-msn.jar \
reference:file:sc-bundles/protocol-sip.jar \
@ -125,7 +125,6 @@ felix.auto.start.6= \
felix.auto.start.7= \
reference:file:sc-bundles/slickless.jar \
reference:file:sc-bundles/configuration-slick.jar \
reference:file:sc-bundles/media-slick.jar \
reference:file:sc-bundles/netaddr-slick.jar \
reference:file:sc-bundles/fileaccess-slick.jar \
reference:file:sc-bundles/history-slick.jar \

6
src/native/portaudio/net_java_sip_communicator_impl_neomedia_portaudio_PortAudio.h
Unescape View File

@ -7,6 +7,12 @@
#ifdef __cplusplus
extern "C" {
#endif
#undef net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_UNSPECIFIED
#define net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_UNSPECIFIED 0.0
#undef net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_HIGH
#define net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_HIGH -1.0
#undef net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_LOW
#define net_java_sip_communicator_impl_neomedia_portaudio_PortAudio_LATENCY_LOW -2.0
/*
* Class: net_java_sip_communicator_impl_neomedia_portaudio_PortAudio
* Method: setEchoCancelParams

20
src/net/java/sip/communicator/impl/protocol/jabber/CallJabberImpl.java
Unescape View File

@ -8,7 +8,7 @@
import java.util.*;
import net.java.sip.communicator.service.media.*;
//import net.java.sip.communicator.service.media.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
@ -40,7 +40,7 @@ public class CallJabberImpl
* The <tt>CallSession</tt> that the media service has created for this
* call.
*/
private CallSession mediaCallSession = null;
// private CallSession mediaCallSession = null;
/**
* Crates a CallJabberImpl instance belonging to <tt>sourceProvider</tt> and
@ -238,10 +238,10 @@ public CallPeerJabberImpl findCallPeer(JingleSession session)
* @param callSession the <tt>CallSession</tt> that the media service has
* created for this call.
*/
public void setMediaCallSession(CallSession callSession)
{
this.mediaCallSession = callSession;
}
// public void setMediaCallSession(CallSession callSession)
// {
// this.mediaCallSession = callSession;
// }
/**
* Sets the <tt>CallSession</tt> that the media service has created for this
@ -251,10 +251,10 @@ public void setMediaCallSession(CallSession callSession)
* created for this call or null if no call session has been created so
* far.
*/
public CallSession getMediaCallSession()
{
return this.mediaCallSession;
}
// public CallSession getMediaCallSession()
// {
// return this.mediaCallSession;
// }
/**
* Gets the indicator which determines whether the local peer represented by

34
src/net/java/sip/communicator/impl/protocol/jabber/JabberActivator.java
Unescape View File

@ -10,7 +10,7 @@
import net.java.sip.communicator.service.configuration.*;
import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.media.*;
//import net.java.sip.communicator.service.media.*;
import net.java.sip.communicator.service.protocol.*;
import net.java.sip.communicator.service.resources.*;
@ -45,7 +45,7 @@ public class JabberActivator
/**
* Media service.
*/
private static MediaService mediaService = null;
// private static MediaService mediaService = null;
/**
* The Jabber protocol provider factory.
@ -150,21 +150,21 @@ static ProtocolProviderFactoryJabberImpl getProtocolProviderFactory()
* @return a reference to a MediaService implementation currently registered
* in the bundle context or null if no such implementation was found.
*/
public static MediaService getMediaService()
{
if(mediaService == null)
{
ServiceReference mediaServiceReference
= bundleContext.getServiceReference(
MediaService.class.getName());
if (mediaServiceReference != null) {
mediaService = (MediaService)
bundleContext.getService(mediaServiceReference);
}
}
return mediaService;
}
// public static MediaService getMediaService()
// {
// if(mediaService == null)
// {
// ServiceReference mediaServiceReference
// = bundleContext.getServiceReference(
// MediaService.class.getName());
//
// if (mediaServiceReference != null) {
// mediaService = (MediaService)
// bundleContext.getService(mediaServiceReference);
// }
// }
// return mediaService;
// }
/**
* Called when this bundle is stopped so the Framework can perform the

36
src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
Unescape View File

@ -665,24 +665,24 @@ protected void initialize(String screenname,
//check if we are supposed to start telephony
//initialize the telephony opset
boolean enableJingle
= JabberActivator
.getConfigurationService()
.getBoolean(PNAME_ENABLE_JINGLE, false);
if(enableJingle && JabberActivator.getMediaService() != null)
{
addSupportedOperationSet(
OperationSetBasicTelephony.class,
new OperationSetBasicTelephonyJabberImpl(this));
// Add Jingle features to supported features.
supportedFeatures.add("urn:xmpp:jingle:1");
supportedFeatures.add("urn:xmpp:jingle:apps:rtp:1");
supportedFeatures.add("urn:xmpp:jingle:apps:rtp:audio");
//one day:
//supportedFeatures.add("urn:xmpp:jingle:apps:rtp:video");
}
// boolean enableJingle
// = JabberActivator
// .getConfigurationService()
// .getBoolean(PNAME_ENABLE_JINGLE, false);
// if(enableJingle && JabberActivator.getMediaService() != null)
// {
// addSupportedOperationSet(
// OperationSetBasicTelephony.class,
// new OperationSetBasicTelephonyJabberImpl(this));
//
// // Add Jingle features to supported features.
// supportedFeatures.add("urn:xmpp:jingle:1");
// supportedFeatures.add("urn:xmpp:jingle:apps:rtp:1");
// supportedFeatures.add("urn:xmpp:jingle:apps:rtp:audio");
//
// //one day:
// //supportedFeatures.add("urn:xmpp:jingle:apps:rtp:video");
// }
isInitialized = true;
}

2
src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
Unescape View File

@ -31,8 +31,6 @@ Import-Package: org.osgi.framework,
net.java.sip.communicator.service.protocol.whiteboardobjects,
net.java.sip.communicator.service.argdelegation,
net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.media,
net.java.sip.communicator.service.media.event,
org.xmlpull.v1,
org.xmlpull.mxp1,
javax.xml.parsers,

74
src/net/java/sip/communicator/impl/protocol/jabber/mediamgr/AudioMediaSession.java
Unescape View File

@ -9,8 +9,8 @@
import java.util.*;
import net.java.sip.communicator.impl.protocol.jabber.*;
import net.java.sip.communicator.service.media.*;
import net.java.sip.communicator.service.media.event.*;
//import net.java.sip.communicator.service.media.*;
//import net.java.sip.communicator.service.media.event.*;
import net.java.sip.communicator.util.*;
import org.jivesoftware.smackx.jingle.*;
@ -27,7 +27,7 @@
*/
public class AudioMediaSession
extends JingleMediaSession
implements MediaListener
// implements MediaListener
{
/**
* the logger used by this class
@ -38,7 +38,7 @@ public class AudioMediaSession
/**
* An audio media session encapsulate a RtpFlow which handle media transfer
*/
private RtpFlow rtpFlow = null;
// private RtpFlow rtpFlow = null;
/**
* Creates an AudioMediaSession with defined payload type,
@ -111,25 +111,25 @@ public void initialize()
Map<String, List<String>> mediaEncoding
= MediaUtils.getAudioEncoding(getPayloadType().getId());
try
{
rtpFlow = JabberActivator.getMediaService().
createRtpFlow(
localIp, localPort,
remoteIp, remotePort,
mediaEncoding);
}
catch (MediaException ex)
{
logger.error("failed to create a RtpFlow between " +
localIp + ":" + localPort + " and " +
remoteIp + ":" + remotePort, ex);
rtpFlow = null;
throw new RuntimeException("failed to create a RtpFlow between "
+ localIp + ":" + localPort + " and "
+ remoteIp + ":" + remotePort,
ex);
}
// try
// {
// rtpFlow = JabberActivator.getMediaService().
// createRtpFlow(
// localIp, localPort,
// remoteIp, remotePort,
// mediaEncoding);
// }
// catch (MediaException ex)
// {
// logger.error("failed to create a RtpFlow between " +
// localIp + ":" + localPort + " and " +
// remoteIp + ":" + remotePort, ex);
// rtpFlow = null;
// throw new RuntimeException("failed to create a RtpFlow between "
// + localIp + ":" + localPort + " and "
// + remoteIp + ":" + remotePort,
// ex);
// }
}
/**
@ -137,7 +137,7 @@ public void initialize()
*/
public void startTrasmit()
{
rtpFlow.start();
// rtpFlow.start();
}
/**
@ -153,10 +153,10 @@ public void startReceive()
*/
public void setTrasmit(boolean active)
{
if (active)
rtpFlow.resume();
else
rtpFlow.pause();
// if (active)
// rtpFlow.resume();
// else
// rtpFlow.pause();
}
/**
@ -165,7 +165,7 @@ public void setTrasmit(boolean active)
public void stopTrasmit()
{
//if (rtpFlow != null)
rtpFlow.stop();
// rtpFlow.stop();
}
/**
@ -220,12 +220,12 @@ public void stopReceive()
* Implementation of <tt>receivedMediaStream</tt> from
* <tt>RtpFlow</tt>.
*/
public void receivedMediaStream(MediaEvent evt)
{
mediaReceived(evt.getFrom());
}
public void mediaServiceStatusChanged()
{
}
// public void receivedMediaStream(MediaEvent evt)
// {
// mediaReceived(evt.getFrom());
// }
//
// public void mediaServiceStatusChanged()
// {
// }
}

24
src/net/java/sip/communicator/impl/protocol/jabber/mediamgr/JingleScMediaManager.java
Unescape View File

@ -77,19 +77,19 @@ private void setupPayloads()
* situations i.e. in most of the cases the allocation will immediately
* be thrown away as garbage. Checking for null is faster.
*/
String[] audioEnc;
String[] audioEnc = null;
try
{
audioEnc = JabberActivator.getMediaService().
getSupportedAudioEncodings();
}
catch (Exception e)
{
audioEnc = null;
logger.warn("Cannot get Audio encodings!", e);
}
// try
// {
// audioEnc = JabberActivator.getMediaService().
// getSupportedAudioEncodings();
// }
// catch (Exception e)
// {
// audioEnc = null;
//
// logger.warn("Cannot get Audio encodings!", e);
// }
if (audioEnc != null)
{

4
src/net/java/sip/communicator/service/protocol/OperationSetVideoTelephony.java
Unescape View File

@ -8,7 +8,6 @@
import java.awt.*;
import net.java.sip.communicator.service.media.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
@ -136,8 +135,7 @@ public void setLocalVideoAllowed(Call call, boolean allowed)
* The property which indicates whether a specific <tt>Call</tt> is
* currently streaming the local video (to a remote destination).
*/
public static final String LOCAL_VIDEO_STREAMING
= CallSession.LOCAL_VIDEO_STREAMING;
public static final String LOCAL_VIDEO_STREAMING = "LOCAL_VIDEO_STREAMING";
/**
* Gets the indicator which determines whether a specific <tt>Call</tt>

Write Preview
Loading…
Cancel
Save