[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-protocol-cvs
Subject:    [Protocol-cvs] transport/rtp rtptran.cpp,1.88.2.2,1.88.2.3
From:       liam_murray () helixcommunity ! org
Date:       2005-03-28 21:21:30
[Download RAW message or body]

Update of /cvsroot/protocol/transport/rtp
In directory cvs-new:/tmp/cvs-serv8115/rtp

Modified Files:
      Tag: hxclient_1_5_0_cayenne
	rtptran.cpp 
Log Message:
added HXLOG; converted DPRINT to HXLOG


Index: rtptran.cpp
===================================================================
RCS file: /cvsroot/protocol/transport/rtp/rtptran.cpp,v
retrieving revision 1.88.2.2
retrieving revision 1.88.2.3
diff -u -d -r1.88.2.2 -r1.88.2.3
--- rtptran.cpp	8 Mar 2005 06:04:05 -0000	1.88.2.2
+++ rtptran.cpp	28 Mar 2005 21:21:27 -0000	1.88.2.3
@@ -79,6 +79,7 @@
 #include "timeval.h"
 #include "tconverter.h"
 #include "rtptypes.h"
+#include "hxtlogutil.h"
 #include "hxqosinfo.h"
 #include "hxqossig.h"
 #include "hxqos.h"
@@ -223,6 +224,7 @@
 
 RTPBaseTransport::~RTPBaseTransport()
 {
+    HXLOGL3(HXLOG_RTSP, "RTPBaseTransport[%p]::~RTPBaseTransport()",this);
     resetStartInfoWaitQueue();
     Done();
 }
@@ -267,6 +269,7 @@
 void
 RTPBaseTransport::Done()
 {
+    HXLOGL3(HXLOG_RTSP, "RTPBaseTransport[%p]::Done()",this);
     HX_RELEASE(m_pQoSInfo);
     HX_RELEASE(m_pBwMgrInput);
     HX_RELEASE(m_pRTCPTran);
@@ -280,6 +283,7 @@
 HX_RESULT
 RTPBaseTransport::init()
 {
+    HXLOGL3(HXLOG_RTSP, "RTPBaseTransport[%p]::init()",this);
     // m_pReportHandler will be freed in RTCPBaseTransport::Done()...
     HX_ASSERT(!m_pReportHandler);
     m_pReportHandler =
@@ -330,6 +334,7 @@
 void
 RTPBaseTransport::addStreamInfo(RTSPStreamInfo* pStreamInfo, UINT32 ulBufferDepth)
 {
+    HXLOGL3(HXLOG_RTSP, "RTPBaseTransport[%p]::addStreamInfo(): str %lu; buffer \
depth = %lu",this, pStreamInfo->m_streamNumber, ulBufferDepth);  \
RTSPTransport::addStreamInfo(pStreamInfo, ulBufferDepth);  
     // there better be only one stream
@@ -420,6 +425,7 @@
 HX_RESULT
 RTPBaseTransport::setFirstSeqNum(UINT16 uStreamNumber, UINT16 uSeqNum)
 {
+    HXLOGL3(HXLOG_RTSP, "RTPBaseTransport[%p]::setFirstSeqNum(); str %u first seq = \
%u",this, uStreamNumber, uSeqNum);  HX_RESULT theErr = HXR_UNEXPECTED;
 
     // On client we allow setting of sequence number only once not to cause
@@ -446,6 +452,8 @@
 RTPBaseTransport::setFirstTimeStamp(UINT16 uStreamNumber, UINT32 ulTS,
                                     BOOL bIsRaw)
 {
+    HXLOGL3(HXLOG_RTSP, "RTPBaseTransport[%p]::setFirstTimeStamp(); str %u first ts \
= %lu",this, uStreamNumber, ulTS); +
     RTSPStreamData* pStreamData =
         m_pStreamHandler->getStreamData(uStreamNumber);
 
@@ -1790,6 +1798,8 @@
                              UINT32 uReasonCode /* = 0 */,
                              const char* pReasonText /* = NULL */)
 {
+    HXLOGL3(HXLOG_RTSP, "RTPBaseTransport[%p]::streamDone(); str %u; reason \
%lu",this, streamNumber, uReasonCode); +
     HX_ASSERT(m_streamNumber == streamNumber);
     HX_ASSERT(m_streamNumber == m_pRTCPTran->m_streamNumber);
     HX_RESULT hresult = HXR_OK;
@@ -2503,6 +2513,7 @@
 
 RTCPBaseTransport::~RTCPBaseTransport()
 {
+    HXLOGL3(HXLOG_RTSP, "RTCPTCPTransport[%p]::~RTCPTCPTransport()",this);
     HX_DELETE(m_pTSConverter);
     HX_RELEASE(m_pTSScheduler);
 }
@@ -3801,6 +3812,8 @@
     //  must be odd port
     HX_ASSERT(1 == m_pPeerAddr->GetPort() % 2);
 
+    HXLOGL3(HXLOG_RTSP, "RTCPUDPTransport[%p]::setPeerAddr(): port = %u",this, \
m_pPeerAddr->GetPort()); +
     UINT32 natTimeout = GetNATTimeout(m_pContext);
 
     if (!m_bIsSource && natTimeout)
@@ -3824,6 +3837,8 @@
 void
 RTCPUDPTransport::JoinMulticast(IHXSockAddr* pAddr, IHXSocket* pSocket)
 {
+    HXLOGL3(HXLOG_RTSP, "RTCPUDPTransport[%p]::JoinMulticast(): port = %u",this, \
pAddr->GetPort()); +
     HX_ASSERT(pAddr);
     if (m_pMulticastAddr)
     {
@@ -3886,6 +3901,8 @@
                              UINT32 uReasonCode /* = 0 */,
                              const char* pReasonText /* = NULL */)
 {
+    HXLOGL3(HXLOG_RTSP, "RTCPUDPTransport[%p]::streamDone(): str = %u; reason = \
%lu",this, streamNumber, uReasonCode); +
     HX_ASSERT(streamNumber == m_streamNumber);
     HX_ASSERT(streamNumber == m_pDataTransport->m_streamNumber);
 


[prev in list] [next in list] [prev in thread] [next in thread]