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

20
webrtc/modules/rtp_rtcp/source/rtp_sender.cc
View File

@ -894,29 +894,17 @@ void RTPSender::UpdateRtpStats(const uint8_t* buffer,
}
total_bitrate_sent_.Update(packet_length);
++counters->transmitted.packets;
if (counters->first_packet_time_ms == -1) {
counters->first_packet_time_ms = clock_->TimeInMilliseconds();
}
if (IsFecPacket(buffer, header)) {
++counters->fec.packets;
counters->fec.payload_bytes +=
packet_length - (header.headerLength + header.paddingLength);
counters->fec.header_bytes += header.headerLength;
counters->fec.padding_bytes += header.paddingLength;
counters->fec.AddPacket(packet_length, header);
}
if (is_retransmit) {
++counters->retransmitted.packets;
counters->retransmitted.payload_bytes +=
packet_length - (header.headerLength + header.paddingLength);
counters->retransmitted.header_bytes += header.headerLength;
counters->retransmitted.padding_bytes += header.paddingLength;
counters->retransmitted.AddPacket(packet_length, header);
}
counters->transmitted.payload_bytes +=
packet_length - (header.headerLength + header.paddingLength);
counters->transmitted.header_bytes += header.headerLength;
counters->transmitted.padding_bytes += header.paddingLength;
counters->transmitted.AddPacket(packet_length, header);
if (rtp_stats_callback_) {
rtp_stats_callback_->DataCountersUpdated(*counters, ssrc);