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..c83203451fb648a7dd62e56fe9ee2442b318af19 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,12 +34,9 @@ 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(int)); |
pbos-webrtc
2016/05/02 01:05:27
size_t
|
+ MOCK_METHOD1(OnReceivedSLI, void(uint8_t picture_id)); |
+ MOCK_METHOD1(OnReceivedRPSI, void(uint64_t picture_id)); |
}; |
TEST(VieKeyRequestTest, CreateAndTriggerRequests) { |
@@ -57,18 +53,15 @@ TEST(VieKeyRequestTest, CreateAndTriggerRequests) { |
EncoderStateFeedback encoder_state_feedback; |
encoder_state_feedback.Init(std::vector<uint32_t>(1, kSsrc), &encoder); |
- EXPECT_CALL(encoder, OnReceivedIntraFrameRequest(kSsrc)) |
- .Times(1); |
+ 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); |
+ 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); |
+ EXPECT_CALL(encoder, OnReceivedRPSI(rpsi_picture_id)).Times(1); |
encoder_state_feedback.OnReceivedRPSI(kSsrc, rpsi_picture_id); |
} |