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

Update StreamDataCounter with FEC bytes.

Browse Source 
Add histograms stats for send/receive FEC bitrate:
- "WebRTC.Video.FecBitrateReceivedInKbps"
- "WebRTC.Video.FecBitrateSentInKbps"

Correct media payload bytes in StreamDataCounter to not include FEC bytes.

Fix stats for rtcp packets sent/received per minute (regression from r7910).

BUG=crbug/419657
R=holmer@google.com, mflodman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8164 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
asapersson@webrtc.org
2015-01-27 12:17:29 +00:00
parent 70117a83d4
commit 273fbbb921
9 changed files with 67 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,10 +200,15 @@ void StreamStatisticianImpl::NotifyRtcpCallback() {
rtcp_callback_->StatisticsUpdated(data, ssrc);
}
void StreamStatisticianImpl::FecPacketReceived() {
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;
}
NotifyRtpCallback();
}
@ -441,12 +446,13 @@ void ReceiveStatisticsImpl::IncomingPacket(const RTPHeader& header,
impl->IncomingPacket(header, packet_length, retransmitted);
}
void ReceiveStatisticsImpl::FecPacketReceived(uint32_t ssrc) {
void ReceiveStatisticsImpl::FecPacketReceived(const RTPHeader& header,
size_t packet_length) {
CriticalSectionScoped cs(receive_statistics_lock_.get());
StatisticianImplMap::iterator it = statisticians_.find(ssrc);
StatisticianImplMap::iterator it = statisticians_.find(header.ssrc);
// Ignore FEC if it is the first packet.
if (it != statisticians_.end()) {
it->second->FecPacketReceived();
it->second->FecPacketReceived(header, packet_length);
}
}
@ -543,7 +549,8 @@ void NullReceiveStatistics::IncomingPacket(const RTPHeader& rtp_header,
size_t packet_length,
bool retransmitted) {}
void NullReceiveStatistics::FecPacketReceived(uint32_t ssrc) {}
void NullReceiveStatistics::FecPacketReceived(const RTPHeader& header,
size_t packet_length) {}
StatisticianMap NullReceiveStatistics::GetActiveStatisticians() const {
return StatisticianMap();