summaryrefslogtreecommitdiff
path: root/orkaudio/audiocaptureplugins
diff options
context:
space:
mode:
authorHenri Herscher <henri@oreka.org>2006-08-01 14:37:42 +0000
committerHenri Herscher <henri@oreka.org>2006-08-01 14:37:42 +0000
commite9e6613de3d149df60b7aab202280c24bec7e72e (patch)
tree380ebefb67200f113ab21ef7c7d2358b1639c97f /orkaudio/audiocaptureplugins
parenta9bb4f02d44aa6b641057eaa888e9028b4cf25e0 (diff)
Applying changeset 265 from 0.5 to trunk:
Fixed problem where sessions with duplicate packets would never Start(). git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@318 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkaudio/audiocaptureplugins')
-rw-r--r--orkaudio/audiocaptureplugins/voip/RtpSession.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
index 76af190..f7e3114 100644
--- a/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
+++ b/orkaudio/audiocaptureplugins/voip/RtpSession.cpp
@@ -50,8 +50,9 @@ RtpSession::RtpSession(CStdString& trackingId)
void RtpSession::Stop()
{
- CStdString lastUpdated = IntToString(m_lastUpdated);
- LOG4CXX_INFO(m_log, m_trackingId + ": " + m_capturePort + " Session stop, last updated:" + lastUpdated);
+ CStdString logMsg;
+ logMsg.Format("%s: %s Session stop, num RTP packets:%d, last updated:%u", m_trackingId, m_capturePort, m_numRtpPackets, m_lastUpdated);
+ LOG4CXX_INFO(m_log, logMsg);
if(m_started && !m_stopped)
{
@@ -315,7 +316,7 @@ bool RtpSession::AddRtpPacket(RtpPacketInfoRef& rtpPacket)
}
}
m_lastRtpPacket = rtpPacket;
- m_numRtpPackets++;
+
if(m_lastRtpPacketSide1.get() == NULL)
{
// First RTP packet for side 1
@@ -362,6 +363,7 @@ bool RtpSession::AddRtpPacket(RtpPacketInfoRef& rtpPacket)
channel = 2;
}
}
+ m_numRtpPackets++;
// Compute the corrective delta
if(m_rtpTimestampCorrectiveDelta == 0 && m_lastRtpPacketSide2.get() != NULL)