| 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 cf92813c48930c6ba502a6e43c846df1121f4cc8..5351e1516b18e078799630297550498b4aa30bc1 100644
|
| --- a/webrtc/video/encoder_state_feedback_unittest.cc
|
| +++ b/webrtc/video/encoder_state_feedback_unittest.cc
|
| @@ -21,14 +21,9 @@
|
|
|
| class MockVieEncoder : public ViEEncoder {
|
| public:
|
| - MockVieEncoder()
|
| - : ViEEncoder(1,
|
| - nullptr,
|
| - VideoSendStream::Config::EncoderSettings("fake", 0, nullptr),
|
| - nullptr,
|
| - nullptr,
|
| - nullptr) {}
|
| - ~MockVieEncoder() { Stop(); }
|
| + explicit MockVieEncoder(ProcessThread* process_thread)
|
| + : ViEEncoder(1, process_thread, nullptr, nullptr, nullptr) {}
|
| + ~MockVieEncoder() {}
|
|
|
| MOCK_METHOD1(OnReceivedIntraFrameRequest, void(size_t));
|
| MOCK_METHOD1(OnReceivedSLI, void(uint8_t picture_id));
|
| @@ -38,7 +33,8 @@
|
| class VieKeyRequestTest : public ::testing::Test {
|
| public:
|
| VieKeyRequestTest()
|
| - : simulated_clock_(123456789),
|
| + : encoder_(&process_thread_),
|
| + simulated_clock_(123456789),
|
| encoder_state_feedback_(
|
| &simulated_clock_,
|
| std::vector<uint32_t>(1, VieKeyRequestTest::kSsrc),
|
| @@ -46,6 +42,7 @@
|
|
|
| protected:
|
| const uint32_t kSsrc = 1234;
|
| + NiceMock<MockProcessThread> process_thread_;
|
| MockVieEncoder encoder_;
|
| SimulatedClock simulated_clock_;
|
| EncoderStateFeedback encoder_state_feedback_;
|
|
|