Removed SSRC knowledge from ViEEncoder.

webrtc/video/encoder_state_feedback_unittest.cc

Index: webrtc/video/encoder_state_feedback_unittest.cc
diff --git a/webrtc/video/encoder_state_feedback_unittest.cc b/webrtc/video/encoder_state_feedback_unittest.cc
index fff5ca82d846f2a51810cb838c8c67c75db82eed..4278142efcd2afe830390503a0b01c887287ac55 100644
--- a/webrtc/video/encoder_state_feedback_unittest.cc
+++ b/webrtc/video/encoder_state_feedback_unittest.cc
@@ -27,7 +27,6 @@ class MockVieEncoder : public ViEEncoder {
  public:
   explicit MockVieEncoder(ProcessThread* process_thread, PacedSender* pacer)
       : ViEEncoder(1,
-                   std::vector<uint32_t>(),
                    process_thread,
                    nullptr,
                    nullptr,
@@ -35,41 +34,61 @@ class MockVieEncoder : public ViEEncoder {
                    pacer) {}
   ~MockVieEncoder() {}
 
-  MOCK_METHOD1(OnReceivedIntraFrameRequest,
-               void(uint32_t));
-  MOCK_METHOD2(OnReceivedSLI,
-               void(uint32_t ssrc, uint8_t picture_id));
-  MOCK_METHOD2(OnReceivedRPSI,
-               void(uint32_t ssrc, uint64_t picture_id));
+  MOCK_METHOD1(OnReceivedIntraFrameRequest, void(size_t));
+  MOCK_METHOD1(OnReceivedSLI, void(uint8_t picture_id));
+  MOCK_METHOD1(OnReceivedRPSI, void(uint64_t picture_id));
 };
 
-TEST(VieKeyRequestTest, CreateAndTriggerRequests) {
-  static const uint32_t kSsrc = 1234;
-  NiceMock<MockProcessThread> process_thread;
-  PacketRouter router;
-  PacedSender pacer(Clock::GetRealTimeClock(), &router,
-                     BitrateController::kDefaultStartBitrateKbps,
-                     PacedSender::kDefaultPaceMultiplier *
-                         BitrateController::kDefaultStartBitrateKbps,
-                     0);
-  MockVieEncoder encoder(&process_thread, &pacer);
+class VieKeyRequestTest : public ::testing::Test {
+ public:
+  VieKeyRequestTest()
+      : pacer_(Clock::GetRealTimeClock(),
+               &router_,
+               BitrateController::kDefaultStartBitrateKbps,
+               PacedSender::kDefaultPaceMultiplier *
+                   BitrateController::kDefaultStartBitrateKbps,
+               0),
+        encoder_(&process_thread_, &pacer_),
+        simulated_clock_(123456789),
+        encoder_state_feedback_(&simulated_clock_) {
+    encoder_state_feedback_.Init(
+        std::vector<uint32_t>(1, VieKeyRequestTest::kSsrc), &encoder_);
+  }
 
-  EncoderStateFeedback encoder_state_feedback;
-  encoder_state_feedback.Init(std::vector<uint32_t>(1, kSsrc), &encoder);
+ protected:
+  const uint32_t kSsrc = 1234;
+  NiceMock<MockProcessThread> process_thread_;
+  PacketRouter router_;
+  PacedSender pacer_;
+  MockVieEncoder encoder_;
+  SimulatedClock simulated_clock_;
+  EncoderStateFeedback encoder_state_feedback_;
+};
 
-  EXPECT_CALL(encoder, OnReceivedIntraFrameRequest(kSsrc))
-      .Times(1);
-  encoder_state_feedback.OnReceivedIntraFrameRequest(kSsrc);
+TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) {
+  EXPECT_CALL(encoder_, OnReceivedIntraFrameRequest(0)).Times(1);
+  encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
 
   const uint8_t sli_picture_id = 3;
-  EXPECT_CALL(encoder, OnReceivedSLI(kSsrc, sli_picture_id))
-      .Times(1);
-  encoder_state_feedback.OnReceivedSLI(kSsrc, sli_picture_id);
+  EXPECT_CALL(encoder_, OnReceivedSLI(sli_picture_id)).Times(1);
+  encoder_state_feedback_.OnReceivedSLI(kSsrc, sli_picture_id);
 
   const uint64_t rpsi_picture_id = 9;
-  EXPECT_CALL(encoder, OnReceivedRPSI(kSsrc, rpsi_picture_id))
-      .Times(1);
-  encoder_state_feedback.OnReceivedRPSI(kSsrc, rpsi_picture_id);
+  EXPECT_CALL(encoder_, OnReceivedRPSI(rpsi_picture_id)).Times(1);
+  encoder_state_feedback_.OnReceivedRPSI(kSsrc, rpsi_picture_id);
+}
+
+TEST_F(VieKeyRequestTest, TooManyOnReceivedIntraFrameRequest) {
+  EXPECT_CALL(encoder_, OnReceivedIntraFrameRequest(0)).Times(1);
+  encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
+  encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
+  encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
+

[pbos-webrtc, 2016/05/03 18:19:59]

Try one that's in the future but too soon (e.g advance time ~10ms?)

[perkj_webrtc, 2016/05/04 08:31:03]

Done.

+  EXPECT_CALL(encoder_, OnReceivedIntraFrameRequest(0)).Times(1);
+  simulated_clock_.AdvanceTimeMilliseconds(300);
+  encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
+  encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
+  encoder_state_feedback_.OnReceivedIntraFrameRequest(kSsrc);
 }
 
 }  // namespace webrtc