|
|
|
@ -332,12 +332,11 @@ protected void configureRTPManagerBufferControl(
|
|
|
|
private TransformEngineChain createTransformEngineChain()
|
|
|
|
private TransformEngineChain createTransformEngineChain()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ArrayList<TransformEngine> engineChain
|
|
|
|
ArrayList<TransformEngine> engineChain
|
|
|
|
= new ArrayList<TransformEngine>(3);
|
|
|
|
= new ArrayList<TransformEngine>(4);
|
|
|
|
|
|
|
|
|
|
|
|
// CSRCs and audio levels
|
|
|
|
// CSRCs and audio levels
|
|
|
|
if (csrcEngine == null)
|
|
|
|
if (csrcEngine == null)
|
|
|
|
csrcEngine = new CsrcTransformEngine(this);
|
|
|
|
csrcEngine = new CsrcTransformEngine(this);
|
|
|
|
|
|
|
|
|
|
|
|
engineChain.add(csrcEngine);
|
|
|
|
engineChain.add(csrcEngine);
|
|
|
|
|
|
|
|
|
|
|
|
// DTMF
|
|
|
|
// DTMF
|
|
|
|
@ -347,7 +346,7 @@ private TransformEngineChain createTransformEngineChain()
|
|
|
|
engineChain.add(dtmfEngine);
|
|
|
|
engineChain.add(dtmfEngine);
|
|
|
|
|
|
|
|
|
|
|
|
// RTCP Statistics
|
|
|
|
// RTCP Statistics
|
|
|
|
if(statisticsEngine == null)
|
|
|
|
if (statisticsEngine == null)
|
|
|
|
statisticsEngine = new StatisticsEngine(this);
|
|
|
|
statisticsEngine = new StatisticsEngine(this);
|
|
|
|
engineChain.add(statisticsEngine);
|
|
|
|
engineChain.add(statisticsEngine);
|
|
|
|
|
|
|
|
|
|
|
|
@ -503,7 +502,7 @@ public void close()
|
|
|
|
|
|
|
|
|
|
|
|
srtpControl.cleanup();
|
|
|
|
srtpControl.cleanup();
|
|
|
|
|
|
|
|
|
|
|
|
if(csrcEngine != null)
|
|
|
|
if (csrcEngine != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
csrcEngine.stop();
|
|
|
|
csrcEngine.stop();
|
|
|
|
csrcEngine = null;
|
|
|
|
csrcEngine = null;
|
|
|
|
@ -515,7 +514,7 @@ public void close()
|
|
|
|
|
|
|
|
|
|
|
|
if (rtpManager != null)
|
|
|
|
if (rtpManager != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if(logger.isInfoEnabled())
|
|
|
|
if (logger.isInfoEnabled())
|
|
|
|
printFlowStatistics(rtpManager);
|
|
|
|
printFlowStatistics(rtpManager);
|
|
|
|
|
|
|
|
|
|
|
|
rtpManager.removeReceiveStreamListener(this);
|
|
|
|
rtpManager.removeReceiveStreamListener(this);
|
|
|
|
@ -843,7 +842,6 @@ private void doSetTarget(MediaStreamTarget target)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
targetIsSet = true;
|
|
|
|
targetIsSet = true;
|
|
|
|
|
|
|
|
|
|
|
|
if (targetIsSet)
|
|
|
|
if (targetIsSet)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
rtpConnectorTarget = target;
|
|
|
|
rtpConnectorTarget = target;
|
|
|
|
@ -859,6 +857,7 @@ private void doSetTarget(MediaStreamTarget target)
|
|
|
|
+ target);
|
|
|
|
+ target);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Gets the <tt>MediaDevice</tt> that this stream uses to play back and
|
|
|
|
* Gets the <tt>MediaDevice</tt> that this stream uses to play back and
|
|
|
|
* capture media.
|
|
|
|
* capture media.
|
|
|
|
@ -1095,8 +1094,6 @@ private StreamRTPManager getRTPManager()
|
|
|
|
if (bc != null)
|
|
|
|
if (bc != null)
|
|
|
|
configureRTPManagerBufferControl(rtpManager, bc);
|
|
|
|
configureRTPManagerBufferControl(rtpManager, bc);
|
|
|
|
|
|
|
|
|
|
|
|
//Emil: if you replace this method with another init method make
|
|
|
|
|
|
|
|
//sure you check that the line below still works.
|
|
|
|
|
|
|
|
rtpManager.initialize(rtpConnector);
|
|
|
|
rtpManager.initialize(rtpConnector);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
@ -1256,74 +1253,74 @@ public void setConnector(StreamConnector connector)
|
|
|
|
if (connector == null)
|
|
|
|
if (connector == null)
|
|
|
|
throw new NullPointerException("connector");
|
|
|
|
throw new NullPointerException("connector");
|
|
|
|
|
|
|
|
|
|
|
|
if (rtpConnector != null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// Is the StreamConnector really changing?
|
|
|
|
|
|
|
|
if (rtpConnector.getConnector() == connector)
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AbstractRTPConnector oldValue = rtpConnector;
|
|
|
|
AbstractRTPConnector oldValue = rtpConnector;
|
|
|
|
|
|
|
|
|
|
|
|
if(connector.getProtocol() == StreamConnector.Protocol.UDP)
|
|
|
|
// Is the StreamConnector really changing?
|
|
|
|
|
|
|
|
if ((oldValue != null) && (oldValue.getConnector() == connector))
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
switch (connector.getProtocol())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
case UDP:
|
|
|
|
rtpConnector
|
|
|
|
rtpConnector
|
|
|
|
= new RTPTransformUDPConnector(connector)
|
|
|
|
= new RTPTransformUDPConnector(connector)
|
|
|
|
{
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
protected TransformUDPOutputStream createDataOutputStream()
|
|
|
|
|
|
|
|
throws IOException
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TransformUDPOutputStream dataOutputStream
|
|
|
|
@Override
|
|
|
|
= super.createDataOutputStream();
|
|
|
|
protected TransformUDPOutputStream createDataOutputStream()
|
|
|
|
|
|
|
|
throws IOException
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
TransformUDPOutputStream dataOutputStream
|
|
|
|
|
|
|
|
= super.createDataOutputStream();
|
|
|
|
|
|
|
|
|
|
|
|
if (dataOutputStream != null)
|
|
|
|
if (dataOutputStream != null)
|
|
|
|
configureDataOutputStream(dataOutputStream);
|
|
|
|
configureDataOutputStream(dataOutputStream);
|
|
|
|
return dataOutputStream;
|
|
|
|
return dataOutputStream;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
protected TransformUDPInputStream createDataInputStream()
|
|
|
|
protected TransformUDPInputStream createDataInputStream()
|
|
|
|
throws IOException
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TransformUDPInputStream dataInputStream
|
|
|
|
TransformUDPInputStream dataInputStream
|
|
|
|
= super.createDataInputStream();
|
|
|
|
= super.createDataInputStream();
|
|
|
|
|
|
|
|
|
|
|
|
if (dataInputStream != null)
|
|
|
|
if (dataInputStream != null)
|
|
|
|
configureDataInputStream(dataInputStream);
|
|
|
|
configureDataInputStream(dataInputStream);
|
|
|
|
return dataInputStream;
|
|
|
|
return dataInputStream;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
else if(connector.getProtocol() == StreamConnector.Protocol.TCP)
|
|
|
|
case TCP:
|
|
|
|
{
|
|
|
|
|
|
|
|
rtpConnector
|
|
|
|
rtpConnector
|
|
|
|
= new RTPTransformTCPConnector(connector)
|
|
|
|
= new RTPTransformTCPConnector(connector)
|
|
|
|
{
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
protected TransformTCPOutputStream createDataOutputStream()
|
|
|
|
|
|
|
|
throws IOException
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TransformTCPOutputStream dataOutputStream
|
|
|
|
@Override
|
|
|
|
= super.createDataOutputStream();
|
|
|
|
protected TransformTCPOutputStream createDataOutputStream()
|
|
|
|
|
|
|
|
throws IOException
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
TransformTCPOutputStream dataOutputStream
|
|
|
|
|
|
|
|
= super.createDataOutputStream();
|
|
|
|
|
|
|
|
|
|
|
|
if (dataOutputStream != null)
|
|
|
|
if (dataOutputStream != null)
|
|
|
|
configureDataOutputStream(dataOutputStream);
|
|
|
|
configureDataOutputStream(dataOutputStream);
|
|
|
|
return dataOutputStream;
|
|
|
|
return dataOutputStream;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
protected TransformTCPInputStream createDataInputStream()
|
|
|
|
protected TransformTCPInputStream createDataInputStream()
|
|
|
|
throws IOException
|
|
|
|
throws IOException
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TransformTCPInputStream dataInputStream
|
|
|
|
TransformTCPInputStream dataInputStream
|
|
|
|
= super.createDataInputStream();
|
|
|
|
= super.createDataInputStream();
|
|
|
|
|
|
|
|
|
|
|
|
if (dataInputStream != null)
|
|
|
|
if (dataInputStream != null)
|
|
|
|
configureDataInputStream(dataInputStream);
|
|
|
|
configureDataInputStream(dataInputStream);
|
|
|
|
return dataInputStream;
|
|
|
|
return dataInputStream;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
|
|
throw new IllegalArgumentException("connector");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
rtpConnectorChanged(oldValue, rtpConnector);
|
|
|
|
rtpConnectorChanged(oldValue, rtpConnector);
|
|
|
|
@ -1362,7 +1359,7 @@ public void setDevice(MediaDevice device)
|
|
|
|
startedDirection = deviceSession.getStartedDirection();
|
|
|
|
startedDirection = deviceSession.getStartedDirection();
|
|
|
|
|
|
|
|
|
|
|
|
deviceSession.removePropertyChangeListener(
|
|
|
|
deviceSession.removePropertyChangeListener(
|
|
|
|
deviceSessionPropertyChangeListener);
|
|
|
|
deviceSessionPropertyChangeListener);
|
|
|
|
|
|
|
|
|
|
|
|
// keep player active
|
|
|
|
// keep player active
|
|
|
|
deviceSession.setDisposePlayerOnClose(
|
|
|
|
deviceSession.setDisposePlayerOnClose(
|
|
|
|
@ -1738,10 +1735,13 @@ private void startSendStreams()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
DataSource sendStreamDataSource
|
|
|
|
|
|
|
|
= sendStream.getDataSource();
|
|
|
|
|
|
|
|
|
|
|
|
// TODO Are we sure we want to connect here?
|
|
|
|
// TODO Are we sure we want to connect here?
|
|
|
|
sendStream.getDataSource().connect();
|
|
|
|
sendStreamDataSource.connect();
|
|
|
|
sendStream.start();
|
|
|
|
sendStream.start();
|
|
|
|
sendStream.getDataSource().start();
|
|
|
|
sendStreamDataSource.start();
|
|
|
|
|
|
|
|
|
|
|
|
if (logger.isTraceEnabled())
|
|
|
|
if (logger.isTraceEnabled())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -1752,8 +1752,7 @@ private void startSendStreams()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (IOException ioe)
|
|
|
|
catch (IOException ioe)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
logger
|
|
|
|
logger.warn("Failed to start stream " + sendStream, ioe);
|
|
|
|
.warn("Failed to start stream " + sendStream, ioe);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -2371,6 +2370,9 @@ private void printFlowStatistics(StreamRTPManager rtpManager)
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void setRTPTranslator(RTPTranslator rtpTranslator)
|
|
|
|
public void setRTPTranslator(RTPTranslator rtpTranslator)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
this.rtpTranslator = rtpTranslator;
|
|
|
|
if (this.rtpTranslator != rtpTranslator)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
this.rtpTranslator = rtpTranslator;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Lyubomir Marinov
14 years ago