[Opalvoip-svn] SF.net SVN: opalvoip:[31014] opal/branches/EpsilonEridani/src/rtp/ rtp_session.cxx

[<rjo...@us...>]

Revision: 31014
          http://sourceforge.net/p/opalvoip/code/31014
Author:   rjongbloed
Date:     2013-11-29 02:40:35 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
More RTP session logging tweaks.

Modified Paths:
--------------
    opal/branches/EpsilonEridani/src/rtp/rtp_session.cxx

Modified: opal/branches/EpsilonEridani/src/rtp/rtp_session.cxx
===================================================================
--- opal/branches/EpsilonEridani/src/rtp/rtp_session.cxx	2013-11-29 01:48:48 UTC (rev 31013)
+++ opal/branches/EpsilonEridani/src/rtp/rtp_session.cxx	2013-11-29 02:40:35 UTC (rev 31014)
@@ -344,6 +344,8 @@
   RTP_ControlFrame report;
   InitialiseControlFrame(report);
 
+  PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending BYE, SSRC=" << RTP_TRACE_SRC(syncSourceOut));
+
   static char const ReasonStr[] = "Session ended";
   static size_t ReasonLen = sizeof(ReasonStr);
 
@@ -558,7 +560,7 @@
     receiver.dlsr = 0;
   }
   
-  PTRACE(3, "RTP\tSession " << m_sessionId << ", SentReceiverReport:"
+  PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending ReceiverReport:"
             " SSRC=" << RTP_TRACE_SRC(syncSourceIn)
          << " fraction=" << (unsigned)receiver.fraction
          << " lost=" << receiver.GetLostPackets()
@@ -947,8 +949,7 @@
 
       // add the SSRC to the start of the payload
       *(PUInt32b *)report.GetPayloadPtr() = syncSourceOut;
-      PTRACE(3, "RTP\tSession " << m_sessionId << ", SentReceiverReport:"
-                " SSRC=" << RTP_TRACE_SRC(syncSourceIn));
+      PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending ReceiverReport: SSRC=" << RTP_TRACE_SRC(syncSourceIn));
     }
     else {
       report.SetPayloadSize(sizeof(PUInt32b) + sizeof(RTP_ControlFrame::ReceiverReport));  // length is SSRC of packet sender plus RR
@@ -981,7 +982,7 @@
     sender->psent    = packetsSent;
     sender->osent    = octetsSent;
 
-    PTRACE(3, "RTP\tSession " << m_sessionId << ", SentSenderReport:"
+    PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending SenderReport:"
               " SSRC=" << RTP_TRACE_SRC(syncSourceOut)
            << " ntp=" << sender->ntp_sec << '.' << sender->ntp_frac
            << " rtp=" << sender->rtp_ts
@@ -998,7 +999,7 @@
   report.EndPacket();
 
   // Add the SDES part to compound RTCP packet
-  PTRACE(3, "RTP\tSession " << m_sessionId << ", sending SDES: " << m_canonicalName);
+  PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending SDES: " << m_canonicalName);
   report.StartNewPacket();
 
   report.SetCount(0); // will be incremented automatically
@@ -1429,11 +1430,13 @@
 
 void OpalRTPSession::SendFlowControl(unsigned maxBitRate, unsigned overhead, bool notify)
 {
-  PTRACE(3, "RTP\tSession " << m_sessionId << ", SendFlowControl(" << maxBitRate << ") using TMMBR");
   // Create packet
   RTP_ControlFrame request;
   InitialiseControlFrame(request);
 
+  PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending TMMBR (flow control) "
+            "rate=" << maxBitRate << ", SSRC=" << RTP_TRACE_SRC(syncSourceIn));
+
   request.StartNewPacket();
 
   request.SetPayloadType(RTP_ControlFrame::e_TransportLayerFeedBack);
@@ -1465,14 +1468,14 @@
 
 void OpalRTPSession::SendIntraFrameRequest(bool rfc2032, bool pictureLoss)
 {
-  PTRACE(3, "RTP\tSession " << m_sessionId << ", SendIntraFrameRequest using "
-         << (rfc2032 ? "RFC2032" : (pictureLoss ? "RFC4585 PLI" : "RFC5104 FIR"))
-         << " for SSRC=" << RTP_TRACE_SRC(syncSourceIn));
-
   // Create packet
   RTP_ControlFrame request;
   InitialiseControlFrame(request);
 
+  PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending "
+         << (rfc2032 ? "RFC2032" : (pictureLoss ? "RFC4585 PLI" : "RFC5104 FIR"))
+         << ", SSRC=" << RTP_TRACE_SRC(syncSourceIn));
+
   request.StartNewPacket();
 
   if (rfc2032) {
@@ -1510,11 +1513,12 @@
 
 void OpalRTPSession::SendTemporalSpatialTradeOff(unsigned tradeOff)
 {
-  PTRACE(3, "RTP\tSession " << m_sessionId << ", SendTemporalSpatialTradeOff " << tradeOff);
-
   RTP_ControlFrame request;
   InitialiseControlFrame(request);
 
+  PTRACE(3, "RTP\tSession " << m_sessionId << ", Sending TSTO (temporal spatial trade off) "
+            "value=" << tradeOff << ", SSRC=" << RTP_TRACE_SRC(syncSourceIn));
+
   request.StartNewPacket();
 
   request.SetPayloadType(RTP_ControlFrame::e_PayloadSpecificFeedBack);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.