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

Add method for incrementing RtpPacketCounter. Removes duplicate code.

Browse Source 
Correction to check if rtx is enabled on send-side (and not receive) when updating rtx send bitrate stat.

Remove unneeded guarded by annotations.

BUG=
R=mflodman@webrtc.org, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/41729004

Cr-Commit-Position: refs/heads/master@{#8239}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8239 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
asapersson@webrtc.org
2015-02-04 08:34:47 +00:00
parent e2506670a4
commit 4414939954
7 changed files with 108 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
View File

@ -81,17 +81,9 @@ void StreamStatisticianImpl::UpdateCounters(const RTPHeader& header,
bool in_order = InOrderPacketInternal(header.sequenceNumber);
ssrc_ = header.ssrc;
incoming_bitrate_.Update(packet_length);
receive_counters_.transmitted.payload_bytes +=
packet_length - (header.paddingLength + header.headerLength);
receive_counters_.transmitted.header_bytes += header.headerLength;
receive_counters_.transmitted.padding_bytes += header.paddingLength;
++receive_counters_.transmitted.packets;
receive_counters_.transmitted.AddPacket(packet_length, header);
if (!in_order && retransmitted) {
++receive_counters_.retransmitted.packets;
receive_counters_.retransmitted.payload_bytes +=
packet_length - (header.paddingLength + header.headerLength);
receive_counters_.retransmitted.header_bytes += header.headerLength;
receive_counters_.retransmitted.padding_bytes += header.paddingLength;
receive_counters_.retransmitted.AddPacket(packet_length, header);
}
if (receive_counters_.transmitted.packets == 1) {
@ -204,11 +196,7 @@ void StreamStatisticianImpl::FecPacketReceived(const RTPHeader& header,
size_t packet_length) {
{
CriticalSectionScoped cs(stream_lock_.get());
++receive_counters_.fec.packets;
receive_counters_.fec.payload_bytes +=
packet_length - (header.headerLength + header.paddingLength);
receive_counters_.fec.header_bytes += header.headerLength;
receive_counters_.fec.padding_bytes += header.paddingLength;
receive_counters_.fec.AddPacket(packet_length, header);
}
NotifyRtpCallback();
}