Make the new jitter buffer the default jitter buffer.

webrtc/video/receive_statistics_proxy_unittest.cc

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 dc944d59e3b70eca876d195e5c1447421b95c56e..b377bfe4689f14939ca7de8b7660155a168201d1 100644
--- a/webrtc/video/receive_statistics_proxy_unittest.cc
+++ b/webrtc/video/receive_statistics_proxy_unittest.cc
@@ -74,14 +74,6 @@ TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsDecoderImplementationName) {
       kName, statistics_proxy_->GetStats().decoder_implementation_name.c_str());
 }
 
-TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsIncomingRate) {

[terelius, 2017/01/12 13:08:34]

Is this no longer relevant, or is there some other test for it?

[philipel, 2017/01/12 16:41:35]

Since the old jitter buffer wont be used anymore no meaningful data will be
reported with the OnIncomingRate function. To avoid it overwriting the actual
data (that is being reported with the new OnCompleteFrame function) I removed
all logic (almost) from OnIncomingRate.

-  const int kFramerate = 28;
-  const int kBitrateBps = 311000;
-  statistics_proxy_->OnIncomingRate(kFramerate, kBitrateBps);

[stefan-webrtc, 2017/01/12 14:16:15]

Perhaps replace this with calls to OnCompleteFrame() so that we still can verify
that stats calculations work?

[philipel, 2017/01/12 16:41:35]

Done.

-  EXPECT_EQ(kFramerate, statistics_proxy_->GetStats().network_frame_rate);
-  EXPECT_EQ(kBitrateBps, statistics_proxy_->GetStats().total_bitrate_bps);
-}
-
 TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsDecodeTimingStats) {
   const int kDecodeMs = 1;
   const int kMaxDecodeMs = 2;
@@ -91,9 +83,10 @@ TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsDecodeTimingStats) {
   const int kMinPlayoutDelayMs = 6;
   const int kRenderDelayMs = 7;
   const int64_t kRttMs = 8;
-  statistics_proxy_->OnDecoderTiming(
-      kDecodeMs, kMaxDecodeMs, kCurrentDelayMs, kTargetDelayMs, kJitterBufferMs,
-      kMinPlayoutDelayMs, kRenderDelayMs, kRttMs);
+  statistics_proxy_->OnRttUpdate(kRttMs, 0);
+  statistics_proxy_->OnDecoderTiming(kDecodeMs, kMaxDecodeMs, kCurrentDelayMs,
+                                     kTargetDelayMs, kJitterBufferMs,
+                                     kMinPlayoutDelayMs, kRenderDelayMs);
   VideoReceiveStream::Stats stats = statistics_proxy_->GetStats();
   EXPECT_EQ(kDecodeMs, stats.decode_ms);
   EXPECT_EQ(kMaxDecodeMs, stats.max_decode_ms);