admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ReceiveStatisticsProxy:

Browse Source 
- add some unit tests
- change SampleCounter members from int to int64_t

BUG=webrtc:5283

Review-Url: https://codereview.webrtc.org/2577073002
Cr-Commit-Position: refs/heads/master@{#15882}
This commit is contained in:
asapersson 2017-01-03 00:44:06 -08:00 committed by Commit bot
parent ce722b3bb8
commit 6966bd51fc
3 changed files with 122 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/video/receive_statistics_proxy.cc
View File

@ -442,10 +442,11 @@ void ReceiveStatisticsProxy::SampleCounter::Add(int sample) {
++num_samples;
}
int ReceiveStatisticsProxy::SampleCounter::Avg(int min_required_samples) const {
int ReceiveStatisticsProxy::SampleCounter::Avg(
int64_t min_required_samples) const {
if (num_samples < min_required_samples || num_samples == 0)
return -1;
return sum / num_samples;
return static_cast<int>(sum / num_samples);
}
void ReceiveStatisticsProxy::SampleCounter::Reset() {

6
webrtc/video/receive_statistics_proxy.h
View File

@ -85,12 +85,12 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback,
struct SampleCounter {
SampleCounter() : sum(0), num_samples(0) {}
void Add(int sample);
int Avg(int min_required_samples) const;
int Avg(int64_t min_required_samples) const;
void Reset();
private:
int sum;
int num_samples;
int64_t sum;
int64_t num_samples;
};
struct QpCounters {
SampleCounter vp8;

116
webrtc/video/receive_statistics_proxy_unittest.cc
View File

@ -12,6 +12,7 @@
#include <memory>
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
#include "webrtc/test/gtest.h"
@ -66,6 +67,13 @@ TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsIncomingPayloadType) {
EXPECT_EQ(kPayloadType, statistics_proxy_->GetStats().current_payload_type);
}
TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsDecoderImplementationName) {
const char* kName = "decoderName";
statistics_proxy_->OnDecoderImplementationName(kName);
EXPECT_STREQ(
kName, statistics_proxy_->GetStats().decoder_implementation_name.c_str());
}
TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsIncomingRate) {
const int kFramerate = 28;
const int kBitrateBps = 311000;
@ -96,12 +104,80 @@ TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsDecodeTimingStats) {
EXPECT_EQ(kRenderDelayMs, stats.render_delay_ms);
}
TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsRtcpPacketTypeCounts) {
const uint32_t kFirPackets = 33;
const uint32_t kPliPackets = 44;
const uint32_t kNackPackets = 55;
RtcpPacketTypeCounter counter;
counter.fir_packets = kFirPackets;
counter.pli_packets = kPliPackets;
counter.nack_packets = kNackPackets;
statistics_proxy_->RtcpPacketTypesCounterUpdated(kRemoteSsrc, counter);
VideoReceiveStream::Stats stats = statistics_proxy_->GetStats();
EXPECT_EQ(kFirPackets, stats.rtcp_packet_type_counts.fir_packets);
EXPECT_EQ(kPliPackets, stats.rtcp_packet_type_counts.pli_packets);
EXPECT_EQ(kNackPackets, stats.rtcp_packet_type_counts.nack_packets);
}
TEST_F(ReceiveStatisticsProxyTest,
GetStatsReportsNoRtcpPacketTypeCountsForUnknownSsrc) {
RtcpPacketTypeCounter counter;
counter.fir_packets = 33;
statistics_proxy_->RtcpPacketTypesCounterUpdated(kRemoteSsrc + 1, counter);
EXPECT_EQ(0u,
statistics_proxy_->GetStats().rtcp_packet_type_counts.fir_packets);
}
TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsFrameCounts) {
const int kKeyFrames = 3;
const int kDeltaFrames = 22;
FrameCounts frame_counts;
frame_counts.key_frames = kKeyFrames;
frame_counts.delta_frames = kDeltaFrames;
statistics_proxy_->OnFrameCountsUpdated(frame_counts);
VideoReceiveStream::Stats stats = statistics_proxy_->GetStats();
EXPECT_EQ(kKeyFrames, stats.frame_counts.key_frames);
EXPECT_EQ(kDeltaFrames, stats.frame_counts.delta_frames);
}
TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsDiscardedPackets) {
const int kDiscardedPackets = 12;
statistics_proxy_->OnDiscardedPacketsUpdated(kDiscardedPackets);
EXPECT_EQ(kDiscardedPackets, statistics_proxy_->GetStats().discarded_packets);
}
TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsRtcpStats) {
const uint8_t kFracLost = 0;
const uint32_t kCumLost = 1;
const uint32_t kExtSeqNum = 10;
const uint32_t kJitter = 4;
RtcpStatistics rtcp_stats;
rtcp_stats.fraction_lost = kFracLost;
rtcp_stats.cumulative_lost = kCumLost;
rtcp_stats.extended_max_sequence_number = kExtSeqNum;
rtcp_stats.jitter = kJitter;
statistics_proxy_->StatisticsUpdated(rtcp_stats, kRemoteSsrc);
VideoReceiveStream::Stats stats = statistics_proxy_->GetStats();
EXPECT_EQ(kFracLost, stats.rtcp_stats.fraction_lost);
EXPECT_EQ(kCumLost, stats.rtcp_stats.cumulative_lost);
EXPECT_EQ(kExtSeqNum, stats.rtcp_stats.extended_max_sequence_number);
EXPECT_EQ(kJitter, stats.rtcp_stats.jitter);
}
TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsCName) {
const char* kName = "cName";
statistics_proxy_->CNameChanged(kName, kRemoteSsrc);
EXPECT_STREQ(kName, statistics_proxy_->GetStats().c_name.c_str());
}
TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsNoCNameForUnknownSsrc) {
const char* kName = "cName";
statistics_proxy_->CNameChanged(kName, kRemoteSsrc + 1);
EXPECT_STREQ("", statistics_proxy_->GetStats().c_name.c_str());
}
TEST_F(ReceiveStatisticsProxyTest, LifetimeHistogramIsUpdated) {
const int64_t kTimeSec = 3;
fake_clock_.AdvanceTimeMilliseconds(kTimeSec * 1000);
@ -202,4 +278,44 @@ TEST_F(ReceiveStatisticsProxyTest, RtpToNtpFrequencyOffsetHistogramIsUpdated) {
EXPECT_EQ(1, metrics::NumEvents("WebRTC.Video.RtpToNtpFreqOffsetInKhz", 3));
}
TEST_F(ReceiveStatisticsProxyTest, Vp8QpHistogramIsUpdated) {
const int kQp = 22;
EncodedImage encoded_image;
encoded_image.qp_ = kQp;
CodecSpecificInfo codec_info;
codec_info.codecType = kVideoCodecVP8;
for (int i = 0; i < kMinRequiredSamples; ++i)
statistics_proxy_->OnPreDecode(encoded_image, &codec_info);
statistics_proxy_.reset();
EXPECT_EQ(1, metrics::NumSamples("WebRTC.Video.Decoded.Vp8.Qp"));
EXPECT_EQ(1, metrics::NumEvents("WebRTC.Video.Decoded.Vp8.Qp", kQp));
}
TEST_F(ReceiveStatisticsProxyTest, Vp8QpHistogramIsNotUpdatedForTooFewSamples) {
EncodedImage encoded_image;
encoded_image.qp_ = 22;
CodecSpecificInfo codec_info;
codec_info.codecType = kVideoCodecVP8;
for (int i = 0; i < kMinRequiredSamples - 1; ++i)
statistics_proxy_->OnPreDecode(encoded_image, &codec_info);
statistics_proxy_.reset();
EXPECT_EQ(0, metrics::NumSamples("WebRTC.Video.Decoded.Vp8.Qp"));
}
TEST_F(ReceiveStatisticsProxyTest, Vp8QpHistogramIsNotUpdatedIfNoQpValue) {
EncodedImage encoded_image;
CodecSpecificInfo codec_info;
codec_info.codecType = kVideoCodecVP8;
for (int i = 0; i < kMinRequiredSamples; ++i)
statistics_proxy_->OnPreDecode(encoded_image, &codec_info);
statistics_proxy_.reset();
EXPECT_EQ(0, metrics::NumSamples("WebRTC.Video.Decoded.Vp8.Qp"));
}
} // namespace webrtc