Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Unified Diff: webrtc/video/encoder_state_feedback_unittest.cc

Issue 2248713003: Revert of Add task queue to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@move_getpadding
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/BUILD.gn ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « webrtc/video/BUILD.gn ('k') | webrtc/video/end_to_end_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698