Index: webrtc/video/receive_statistics_proxy_unittest.cc |
diff --git a/webrtc/video/receive_statistics_proxy_unittest.cc b/webrtc/video/receive_statistics_proxy_unittest.cc |
index 98ec7eddad24409ec3097b6c6568c3190be064a3..7cc8ffedaa610d1bb5c1665e8e64da98499d039b 100644 |
--- a/webrtc/video/receive_statistics_proxy_unittest.cc |
+++ b/webrtc/video/receive_statistics_proxy_unittest.cc |
@@ -308,7 +308,7 @@ TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsNoCNameForUnknownSsrc) { |
} |
TEST_F(ReceiveStatisticsProxyTest, |
- GetTimingFrameInfoReportsLongestTimingFrame) { |
+ ReportsLongestTimingFrameInfo) { |
const int64_t kShortEndToEndDelay = 10; |
const int64_t kMedEndToEndDelay = 20; |
const int64_t kLongEndToEndDelay = 100; |
@@ -328,24 +328,28 @@ TEST_F(ReceiveStatisticsProxyTest, |
info.capture_time_ms = 0; |
info.decode_finish_ms = kMedEndToEndDelay; |
statistics_proxy_->OnTimingFrameInfoUpdated(info); |
- result = statistics_proxy_->GetAndResetTimingFrameInfo(); |
+ result = statistics_proxy_->GetStats().timing_frame_info; |
EXPECT_TRUE(result); |
EXPECT_EQ(kExpectedRtpTimestamp, result->rtp_timestamp); |
} |
-TEST_F(ReceiveStatisticsProxyTest, GetTimingFrameInfoTimingFramesReportedOnce) { |
+TEST_F(ReceiveStatisticsProxyTest, RespectsReportingIntervalForTimingFrames) { |
+ TimingFrameInfo info; |
const int64_t kShortEndToEndDelay = 10; |
const uint32_t kExpectedRtpTimestamp = 2; |
- TimingFrameInfo info; |
+ const int64_t kShortDelay = 1000; |
sprang_webrtc
2017/08/31 13:24:43
nit: kShortDelayMs
ilnik
2017/08/31 13:32:59
Done.
|
+ const int64_t kLongDelay = 10000; |
rtc::Optional<TimingFrameInfo> result; |
info.rtp_timestamp = kExpectedRtpTimestamp; |
info.capture_time_ms = 0; |
info.decode_finish_ms = kShortEndToEndDelay; |
statistics_proxy_->OnTimingFrameInfoUpdated(info); |
- result = statistics_proxy_->GetAndResetTimingFrameInfo(); |
+ fake_clock_.AdvanceTimeMilliseconds(kShortDelay); |
+ result = statistics_proxy_->GetStats().timing_frame_info; |
EXPECT_TRUE(result); |
EXPECT_EQ(kExpectedRtpTimestamp, result->rtp_timestamp); |
- result = statistics_proxy_->GetAndResetTimingFrameInfo(); |
+ fake_clock_.AdvanceTimeMilliseconds(kLongDelay); |
+ result = statistics_proxy_->GetStats().timing_frame_info; |
EXPECT_FALSE(result); |
} |