Wire up VCMTiming in FrameBuffer2.

webrtc/modules/video_coding/frame_buffer2_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 52 matching lines @@
 
 class VCMJitterEstimatorMock : public VCMJitterEstimator {
  public:
   explicit VCMJitterEstimatorMock(Clock* clock) : VCMJitterEstimator(clock) {}
 
   MOCK_METHOD1(UpdateRtt, void(int64_t rttMs));
   MOCK_METHOD3(UpdateEstimate,
                void(int64_t frameDelayMs,
                     uint32_t frameSizeBytes,
                     bool incompleteFrame));
+  MOCK_METHOD1(GetJitterEstimate, int(double rttMultiplier));

[stefan-webrtc, 2016/08/02 14:19:03]

rtt_multiplier

 };
 
 class FrameObjectFake : public FrameObject {
  public:
   bool GetBitstream(uint8_t* destination) const override { return true; }
 
   uint32_t Timestamp() const override { return timestamp; }
 
   int64_t ReceivedTime() const override { return 0; }
 
@@ skipping 88 matching lines @@
 
         tfb->frames_.emplace_back(tfb->buffer_.NextFrame(tfb->max_wait_time_));
       }
     }
   }
 
   uint32_t Rand() { return rand_.Rand<uint32_t>(); }
 
   SimulatedClock clock_;
   VCMTimingFake timing_;
-  VCMJitterEstimatorMock jitter_estimator_;
+  ::testing::NiceMock<VCMJitterEstimatorMock> jitter_estimator_;
   FrameBuffer buffer_;
   std::vector<std::unique_ptr<FrameObject>> frames_;
   Random rand_;
 
   int64_t max_wait_time_;
   bool tear_down_;
   rtc::PlatformThread extract_thread_;
   rtc::Event trigger_extract_event_;
   rtc::Event crit_acquired_event_;
   rtc::CriticalSection crit_;
@@ skipping 137 matching lines @@
   InsertFrame(pid + 2, 0, ts, false);
   ExtractFrame();
   InsertFrame(pid + 1, 0, ts, false, pid);
   ExtractFrame();
 
   CheckFrame(0, pid, 0);
   CheckFrame(1, pid + 2, 0);
   CheckNoFrame(2);
 }
 
+TEST_F(TestFrameBuffer2, ProtectionMode) {
+  uint16_t pid = Rand();
+  uint32_t ts = Rand();
+
+  EXPECT_CALL(jitter_estimator_, GetJitterEstimate(1.0));
+  InsertFrame(pid, 0, ts, false);
+  ExtractFrame();
+
+  buffer_.SetProtectionMode(kProtectionNackFEC);
+  EXPECT_CALL(jitter_estimator_, GetJitterEstimate(0.0));
+  InsertFrame(pid + 1, 0, ts, false);
+  ExtractFrame();
+}
+
 }  // namespace video_coding
 }  // namespace webrtc