|
From: <cso...@us...> - 2007-10-22 03:41:51
|
Revision: 18711
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18711&view=rev
Author: csoutheren
Date: 2007-10-21 20:41:55 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Change display name for G.723.1 to use correct IANA string
Modified Paths:
--------------
opal/trunk/src/rtp/rtp.cxx
Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx 2007-10-22 03:34:14 UTC (rev 18710)
+++ opal/trunk/src/rtp/rtp.cxx 2007-10-22 03:41:55 UTC (rev 18711)
@@ -772,7 +772,7 @@
"FS1016",
"G721",
"GSM",
- "G7231",
+ "G723",
"DVI4_8k",
"DVI4_16k",
"LPC",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-03-04 03:11:29
|
Revision: 19659
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19659&view=rev
Author: rjongbloed
Date: 2008-03-03 19:11:33 -0800 (Mon, 03 Mar 2008)
Log Message:
-----------
Fixed propagation of "too late" packets from jitter buffer to statistics function.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp.cxx
Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx 2008-03-04 00:48:44 UTC (rev 19658)
+++ opal/trunk/src/rtp/rtp.cxx 2008-03-04 03:11:33 UTC (rev 19659)
@@ -1136,6 +1136,7 @@
statistics.m_totalPackets = receiver ? GetPacketsReceived() : GetPacketsSent();
statistics.m_packetsLost = receiver ? GetPacketsLost() : 0;
statistics.m_packetsOutOfOrder = receiver ? GetPacketsOutOfOrder() : 0;
+ statistics.m_packetsTooLate = receiver ? GetPacketsTooLate() : 0;
statistics.m_packetOverruns = receiver ? GetPacketOverruns() : 0;
statistics.m_minimumPacketTime = receiver ? GetMinimumReceiveTime() : GetMinimumSendTime();
statistics.m_averagePacketTime = receiver ? GetAverageReceiveTime() : GetAverageSendTime();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-04-08 06:28:09
|
Revision: 19934
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=19934&view=rev
Author: rjongbloed
Date: 2008-04-07 23:28:12 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Utilise new functions on STUN client to not try and create RTP sockets when it is guaranteed to fail, taking several timeouts. This speeds up things like SIP INVITE on multi interface systems markedly.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp.cxx
Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx 2008-04-08 06:25:51 UTC (rev 19933)
+++ opal/trunk/src/rtp/rtp.cxx 2008-04-08 06:28:12 UTC (rev 19934)
@@ -1648,23 +1648,24 @@
// allow for special case of portBase == 0 or portMax == 0, which indicates a shared RTP session
if ((portBase != 0) || (portMax != 0)) {
- if (stun != NULL) {
- if (stun->CreateSocketPair(dataSocket, controlSocket)) {
+ if (stun != NULL && stun->IsAvailable(localAddress) && stun->GetRTPSupport() == PSTUNClient::RTPSupported) {
+ if (stun->CreateSocketPair(dataSocket, controlSocket, localAddress)) {
dataSocket->GetLocalAddress(localAddress, localDataPort);
controlSocket->GetLocalAddress(localAddress, localControlPort);
}
else {
PTRACE(2, "RTP\tSession " << sessionID << ", STUN could not create RTP/RTCP socket pair; trying to create RTP socket anyway.");
- if (stun->CreateSocket(dataSocket)) {
+ if (stun->CreateSocket(dataSocket, localAddress) && stun->CreateSocket(controlSocket)) {
dataSocket->GetLocalAddress(localAddress, localDataPort);
+ controlSocket->GetLocalAddress(localAddress, localControlPort);
}
else {
- PTRACE(1, "RTP\tSession " << sessionID << ", STUN could not create RTP socket either.");
- return PFalse;
+ delete dataSocket;
+ delete controlSocket;
+ dataSocket = NULL;
+ controlSocket = NULL;
+ PTRACE(2, "RTP\tSession " << sessionID << ", STUN could not create RTP sockets individually either.");
}
- if (stun->CreateSocket(controlSocket)) {
- controlSocket->GetLocalAddress(localAddress, localControlPort);
- }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cso...@us...> - 2008-04-28 03:44:10
|
Revision: 20133
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20133&view=rev
Author: csoutheren
Date: 2008-04-27 20:44:16 -0700 (Sun, 27 Apr 2008)
Log Message:
-----------
Always display SSRC and CSRC in hex
Modified Paths:
--------------
opal/trunk/src/rtp/rtp.cxx
Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx 2008-04-27 13:34:53 UTC (rev 20132)
+++ opal/trunk/src/rtp/rtp.cxx 2008-04-28 03:44:16 UTC (rev 20133)
@@ -210,7 +210,7 @@
<< " PT=" << GetPayloadType()
<< " SN=" << GetSequenceNumber()
<< " TS=" << GetTimestamp()
- << " SSRC=" << GetSyncSource()
+ << " SSRC=" << hex << GetSyncSource() << dec
<< " size=" << GetPayloadSize()
<< '\n';
@@ -804,8 +804,8 @@
<< " x=" << frame.GetExtension()
<< " seq=" << frame.GetSequenceNumber()
<< " ts=" << frame.GetTimestamp()
- << " src=" << frame.GetSyncSource()
- << " ccnt=" << frame.GetContribSrcCount());
+ << " src=" << hex << frame.GetSyncSource()
+ << " ccnt=" << frame.GetContribSrcCount() << dec);
}
else {
@@ -941,20 +941,22 @@
<< " x=" << frame.GetExtension()
<< " seq=" << frame.GetSequenceNumber()
<< " ts=" << frame.GetTimestamp()
- << " src=" << frame.GetSyncSource()
- << " ccnt=" << frame.GetContribSrcCount());
+ << " src=" << hex << frame.GetSyncSource()
+ << " ccnt=" << frame.GetContribSrcCount() << dec);
}
else {
if (frame.GetSyncSource() != syncSourceIn) {
- if (allowAnySyncSource)
+ if (allowAnySyncSource) {
+ PTRACE(2, "RTP\tSession " << sessionID << ", SSRC changed from " << hex << frame.GetSyncSource() << " to " << syncSourceIn << dec);
syncSourceIn = frame.GetSyncSource();
+ }
else if (allowOneSyncSourceChange) {
- PTRACE(2, "RTP\tSession " << sessionID << ", allowed one SSRC change from SSRC=" << syncSourceIn << " to =" << frame.GetSyncSource());
+ PTRACE(2, "RTP\tSession " << sessionID << ", allowed one SSRC change from SSRC=" << hex << syncSourceIn << " to =" << dec << frame.GetSyncSource() << dec);
syncSourceIn = frame.GetSyncSource();
allowOneSyncSourceChange = false;
}
else {
- PTRACE(2, "RTP\tSession " << sessionID << ", packet from SSRC=" << frame.GetSyncSource() << " ignored, expecting SSRC=" << syncSourceIn);
+ PTRACE(2, "RTP\tSession " << sessionID << ", packet from SSRC=" << hex << frame.GetSyncSource() << " ignored, expecting SSRC=" << syncSourceIn << dec);
return e_IgnorePacket; // Non fatal error, just ignore
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-05-07 06:25:47
|
Revision: 20217
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20217&view=rev
Author: rjongbloed
Date: 2008-05-06 23:25:52 -0700 (Tue, 06 May 2008)
Log Message:
-----------
Fixed infinite recursion
Modified Paths:
--------------
opal/trunk/src/rtp/rtp.cxx
Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx 2008-05-07 06:09:30 UTC (rev 20216)
+++ opal/trunk/src/rtp/rtp.cxx 2008-05-07 06:25:52 UTC (rev 20217)
@@ -2181,7 +2181,7 @@
RTP_Session::SendReceiveStatus RTP_FormatHandler::OnReadTimeout(RTP_DataFrame & frame)
{
- return rtpUDP->OnReadTimeout(frame);
+ return rtpUDP->Internal_OnReadTimeout(frame);
}
PBoolean RTP_FormatHandler::ReadData(RTP_DataFrame & frame, PBoolean loop)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-05-13 04:26:00
|
Revision: 20254
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20254&view=rev
Author: rjongbloed
Date: 2008-05-12 21:25:27 -0700 (Mon, 12 May 2008)
Log Message:
-----------
Prevent deadlock on RTP handler switch to udptl shutting down jitter buffer.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp.cxx
Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx 2008-05-13 04:22:55 UTC (rev 20253)
+++ opal/trunk/src/rtp/rtp.cxx 2008-05-13 04:25:27 UTC (rev 20254)
@@ -2080,30 +2080,32 @@
void RTP_Session::SetFormat(const PString & newFormat)
{
- PWaitAndSignal m(handlerMutex);
+ {
+ PWaitAndSignal m(handlerMutex);
- if (newFormat == rtpFormat)
- return;
+ if (newFormat == rtpFormat)
+ return;
- RTP_FormatHandler * newHandler = PFactory<RTP_FormatHandler>::CreateInstance(newFormat);
- if (newHandler == NULL) {
- PTRACE(2, "RTP\tUnable to identify new RTP format '" << newFormat << "' - retaining old format '" << rtpFormat << "'");
- return;
- }
+ RTP_FormatHandler * newHandler = PFactory<RTP_FormatHandler>::CreateInstance(newFormat);
+ if (newHandler == NULL) {
+ PTRACE(2, "RTP\tUnable to identify new RTP format '" << newFormat << "' - retaining old format '" << rtpFormat << "'");
+ return;
+ }
- if (rtpHandler != NULL) {
- --rtpHandler->refCount;
- if (rtpHandler->refCount == 0)
- delete rtpHandler;
- rtpHandler = NULL;
- }
+ if (rtpHandler != NULL) {
+ --rtpHandler->refCount;
+ if (rtpHandler->refCount == 0)
+ delete rtpHandler;
+ rtpHandler = NULL;
+ }
- PTRACE_IF(2, !rtpFormat.IsEmpty(), "RTP\tChanged RTP session format from '" << rtpFormat << "' to '" << newFormat << "'");
+ PTRACE_IF(2, !rtpFormat.IsEmpty(), "RTP\tChanged RTP session format from '" << rtpFormat << "' to '" << newFormat << "'");
- rtpFormat = newFormat;
- rtpHandler = newHandler;
+ rtpFormat = newFormat;
+ rtpHandler = newHandler;
+ }
- rtpHandler->OnStart(*this);
+ HandlerLock(*this)->OnStart(*this);
}
/////////////////////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-05-18 10:04:03
|
Revision: 20282
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20282&view=rev
Author: rjongbloed
Date: 2008-05-18 03:03:59 -0700 (Sun, 18 May 2008)
Log Message:
-----------
Fixed support of Port Restricted NAT routers for RTP. May not always work but this gives it a fighting chance.
Modified Paths:
--------------
opal/trunk/src/rtp/rtp.cxx
Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx 2008-05-18 09:53:05 UTC (rev 20281)
+++ opal/trunk/src/rtp/rtp.cxx 2008-05-18 10:03:59 UTC (rev 20282)
@@ -1573,35 +1573,51 @@
}
// allow for special case of portBase == 0 or portMax == 0, which indicates a shared RTP session
- _localAddress = PIPSocket::Address ("192.168.0.100");
if ((portBase != 0) || (portMax != 0)) {
- if (stun != NULL && stun->IsAvailable(localAddress) && stun->GetRTPSupport() == PSTUNClient::RTPSupported) {
- if (stun->CreateSocketPair(dataSocket, controlSocket, localAddress)) {
- PTRACE(4, "RTP\tSession " << sessionID << ", STUN created RTP/RTCP socket pair.");
- dataSocket->GetLocalAddress(localAddress, localDataPort);
- controlSocket->GetLocalAddress(localAddress, localControlPort);
+ PIPSocket::Address bindingAddress = localAddress;
+ if (stun != NULL && stun->IsAvailable(localAddress)) {
+ switch (stun->GetRTPSupport()) {
+ case PSTUNClient::RTPSupported :
+ if (stun->CreateSocketPair(dataSocket, controlSocket, localAddress)) {
+ PTRACE(4, "RTP\tSession " << sessionID << ", STUN created RTP/RTCP socket pair.");
+ dataSocket->GetLocalAddress(localAddress, localDataPort);
+ controlSocket->GetLocalAddress(localAddress, localControlPort);
+ }
+ else {
+ PTRACE(2, "RTP\tSession " << sessionID << ", STUN could not create RTP/RTCP socket pair; trying to create RTP socket anyway.");
+ if (stun->CreateSocket(dataSocket, localAddress) && stun->CreateSocket(controlSocket, localAddress)) {
+ dataSocket->GetLocalAddress(localAddress, localDataPort);
+ controlSocket->GetLocalAddress(localAddress, localControlPort);
+ }
+ else {
+ delete dataSocket;
+ delete controlSocket;
+ dataSocket = NULL;
+ controlSocket = NULL;
+ PTRACE(2, "RTP\tSession " << sessionID << ", STUN could not create RTP sockets individually either.");
+ }
+ }
+ break;
+
+ case PSTUNClient::RTPIfSendMedia :
+ // We canot use STUN to create sockets as the NAT router will then
+ // not let us talk to the real RTP destination. All we can so is bind
+ // to the local interface, which telling the remote our address is the
+ // external address of the NATrouter, and hope the remote is tolerant
+ // enough of things like non adjacent RTP/RTCP ports etc.
+ bindingAddress = stun->GetInterfaceAddress();
+ break;
+
+ default :
+ break;
}
- else {
- PTRACE(2, "RTP\tSession " << sessionID << ", STUN could not create RTP/RTCP socket pair; trying to create RTP socket anyway.");
- if (stun->CreateSocket(dataSocket, localAddress) && stun->CreateSocket(controlSocket, localAddress)) {
- dataSocket->GetLocalAddress(localAddress, localDataPort);
- controlSocket->GetLocalAddress(localAddress, localControlPort);
- }
- else {
- delete dataSocket;
- delete controlSocket;
- dataSocket = NULL;
- controlSocket = NULL;
- PTRACE(2, "RTP\tSession " << sessionID << ", STUN could not create RTP sockets individually either.");
- }
- }
}
if (dataSocket == NULL || controlSocket == NULL) {
dataSocket = new PUDPSocket(dataQos);
controlSocket = new PUDPSocket(ctrlQos);
- while (!dataSocket->Listen(localAddress, 1, localDataPort) ||
- !controlSocket->Listen(localAddress, 1, localControlPort)) {
+ while (! dataSocket->Listen(bindingAddress, 1, localDataPort) ||
+ !controlSocket->Listen(bindingAddress, 1, localControlPort)) {
dataSocket->Close();
controlSocket->Close();
if ((localDataPort > portMax) || (localDataPort > 0xfffd))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2008-05-24 08:10:58
|
Revision: 20302
http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20302&view=rev
Author: rjongbloed
Date: 2008-05-24 01:11:06 -0700 (Sat, 24 May 2008)
Log Message:
-----------
Added extra trace log
Modified Paths:
--------------
opal/trunk/src/rtp/rtp.cxx
Modified: opal/trunk/src/rtp/rtp.cxx
===================================================================
--- opal/trunk/src/rtp/rtp.cxx 2008-05-24 08:08:03 UTC (rev 20301)
+++ opal/trunk/src/rtp/rtp.cxx 2008-05-24 08:11:06 UTC (rev 20302)
@@ -1748,6 +1748,7 @@
static const BYTE dummy[1] = { 0 };
WriteDataOrControlPDU(dummy, sizeof(dummy), true);
WriteDataOrControlPDU(dummy, sizeof(dummy), false);
+ PTRACE(2, "RTP_UDP\tSession " << sessionID << ", sending empty datagrams to open local Port Restricted NAT");
}
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
