zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More trace events

Browse Source 
The goal of this change is to unify tracing events styles
and add trace events for all RTP traffic.

BUG=1555
Review URL: https://webrtc-codereview.appspot.com/1290007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3806 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
hclam@chromium.org
2013-04-09 19:54:10 +00:00
parent 4d2f5de67a
commit 806dc3b0e6
20 changed files with 199 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
View File

@ -14,6 +14,7 @@
#include <cassert> //assert
#include "trace.h"
#include "trace_event.h"
#include "critical_section_wrapper.h"
#include "rtcp_utility.h"
#include "rtp_rtcp_impl.h"
@ -397,8 +398,9 @@ RTCPReceiver::HandleSenderReceiverReport(RTCPUtility::RTCPParserV2& rtcpParser,
if (rtcpPacketType == RTCPUtility::kRtcpSrCode)
{
WEBRTC_TRACE(kTraceDebug, kTraceRtpRtcp, _id,
"Received SR(%d). SSRC:0x%x, from SSRC:0x%x, to us %d.", _id, _SSRC, remoteSSRC, (_remoteSSRC == remoteSSRC)?1:0);
TRACE_EVENT_INSTANT2("webrtc_rtp", "SR",
"remote_ssrc", remoteSSRC,
"ssrc", _SSRC);
if (_remoteSSRC == remoteSSRC) // have I received RTP packets from this party
{
@ -427,8 +429,9 @@ RTCPReceiver::HandleSenderReceiverReport(RTCPUtility::RTCPParserV2& rtcpParser,
}
} else
{
WEBRTC_TRACE(kTraceDebug, kTraceRtpRtcp, _id,
"Received RR(%d). SSRC:0x%x, from SSRC:0x%x", _id, _SSRC, remoteSSRC);
TRACE_EVENT_INSTANT2("webrtc_rtp", "RR",
"remote_ssrc", remoteSSRC,
"ssrc", _SSRC);
rtcpPacketInformation.rtcpPacketTypeFlags |= kRtcpRr;
}
@ -481,6 +484,10 @@ RTCPReceiver::HandleReportBlock(const RTCPUtility::RTCPPacket& rtcpPacket,
_lastReceivedRrMs = _clock->TimeInMilliseconds();
const RTCPPacketReportBlockItem& rb = rtcpPacket.ReportBlockItem;
TRACE_COUNTER_ID1("webrtc_rtp", "RRFractionLost", rb.SSRC, rb.FractionLost);
TRACE_COUNTER_ID1("webrtc_rtp", "RRCumulativeNumOfPacketLost",
rb.SSRC, rb.CumulativeNumOfPacketsLost);
TRACE_COUNTER_ID1("webrtc_rtp", "RRJitter", rb.SSRC, rb.Jitter);
reportBlock->remoteReceiveBlock.remoteSSRC = remoteSSRC;
reportBlock->remoteReceiveBlock.sourceSSRC = rb.SSRC;
reportBlock->remoteReceiveBlock.fractionLost = rb.FractionLost;
@ -554,9 +561,7 @@ RTCPReceiver::HandleReportBlock(const RTCPUtility::RTCPPacket& rtcpPacket,
reportBlock->numAverageCalcs++;
}
WEBRTC_TRACE(kTraceDebug, kTraceRtpRtcp, _id,
" -> Received report block(%d), from SSRC:0x%x, RTT:%d, loss:%d",
_id, remoteSSRC, RTT, rtcpPacket.ReportBlockItem.FractionLost);
TRACE_COUNTER_ID1("webrtc_rtp", "RR_RTT", rb.SSRC, RTT);
// rtcpPacketInformation
rtcpPacketInformation.AddReportInfo(