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

Make sure histograms in jitter buffer are only updated if running.

Browse Source 
BUG=
R=pbos@webrtc.org, stefan@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#9076}
This commit is contained in:
Åsa Persson
2015-04-24 08:52:11 +02:00
parent affcfb2f16
commit a96f02b6f3
4 changed files with 89 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/main/source/jitter_buffer.cc
View File

@ -171,7 +171,7 @@ VCMJitterBuffer::~VCMJitterBuffer() {
}
void VCMJitterBuffer::UpdateHistograms() {
if (num_packets_ <= 0) {
if (num_packets_ <= 0 || !running_) {
return;
}
int64_t elapsed_sec =

44
webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
View File

@ -20,6 +20,8 @@
#include "webrtc/modules/video_coding/main/source/test/stream_generator.h"
#include "webrtc/modules/video_coding/main/test/test_util.h"
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/metrics.h"
#include "webrtc/test/histogram.h"
namespace webrtc {
@ -275,6 +277,48 @@ TEST_F(TestBasicJitterBuffer, SinglePacketFrame) {
jitter_buffer_->ReleaseFrame(frame_out);
}
TEST_F(TestBasicJitterBuffer, VerifyHistogramStats) {
test::ClearHistograms();
// Always start with a complete key frame when not allowing errors.
jitter_buffer_->SetDecodeErrorMode(kNoErrors);
packet_->frameType = kVideoFrameKey;
packet_->isFirstPacket = true;
packet_->markerBit = true;
packet_->timestamp += 123 * 90;
// Insert single packet frame to the jitter buffer and get a frame.
bool retransmitted = false;
EXPECT_EQ(kCompleteSession, jitter_buffer_->InsertPacket(*packet_,
&retransmitted));
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
CheckOutFrame(frame_out, size_, false);
EXPECT_EQ(kVideoFrameKey, frame_out->FrameType());
jitter_buffer_->ReleaseFrame(frame_out);
// Verify that histograms are updated when the jitter buffer is stopped.
clock_->AdvanceTimeMilliseconds(metrics::kMinRunTimeInSeconds * 1000);
jitter_buffer_->Stop();
EXPECT_EQ(0, test::LastHistogramSample(
"WebRTC.Video.DiscardedPacketsInPercent"));
EXPECT_EQ(0, test::LastHistogramSample(
"WebRTC.Video.DuplicatedPacketsInPercent"));
EXPECT_NE(-1, test::LastHistogramSample(
"WebRTC.Video.CompleteFramesReceivedPerSecond"));
EXPECT_EQ(1000, test::LastHistogramSample(
"WebRTC.Video.KeyFramesReceivedInPermille"));
// Verify that histograms are not updated if stop is called again.
jitter_buffer_->Stop();
EXPECT_EQ(1, test::NumHistogramSamples(
"WebRTC.Video.DiscardedPacketsInPercent"));
EXPECT_EQ(1, test::NumHistogramSamples(
"WebRTC.Video.DuplicatedPacketsInPercent"));
EXPECT_EQ(1, test::NumHistogramSamples(
"WebRTC.Video.CompleteFramesReceivedPerSecond"));
EXPECT_EQ(1, test::NumHistogramSamples(
"WebRTC.Video.KeyFramesReceivedInPermille"));
}
TEST_F(TestBasicJitterBuffer, DualPacketFrame) {
packet_->frameType = kVideoFrameKey;
packet_->isFirstPacket = true;