commit 26091b1118e37b5cbbfe0de9869127fd5c1b01d0
author perkj <perkj@webrtc.org> Thu Sep 01 08:17:40 2016
committer Commit bot <commit-bot@chromium.org> Thu Sep 01 08:17:43 2016
tree dc50c0b97bbbc9035467f8842ba4492c47a6bc8b
parent 9f8e37b6f833cb6c821c6f401421b7c33cbe4b27

This reverts commit 8eb37a39e79fe1098d3503dcb8c8c2d196203fed. Chrome now have its own implementation of TaskQueues that is based on Chrome threads.

cl was originally reviewed here:
https://codereview.webrtc.org/2060403002/

- Add task queue to Call with the intent of replacing the use of one of the process threads.

- Split VideoSendStream in two. VideoSendStreamInternal is created and used on the new task queue.

- BitrateAllocator is now created on libjingle's worker thread but always used on the new task queue instead of both encoder threads and the process thread.

- VideoEncoderConfig and VideoSendStream::Config support move semantics.

- The encoder thread is moved from VideoSendStream to ViEEncoder. Frames are forwarded directly to ViEEncoder which is responsible for timestamping ? and encoding the frames.

TBR=mflodman@webrtc.org
BUG=webrtc:5687

Review-Url: https://codereview.webrtc.org/2250123002
Cr-Commit-Position: refs/heads/master@{#14014}

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