Move encoder thread to VideoSendStream.

webrtc/video/video_capture_input_unittest.cc

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/video/video_capture_input.h"
 
 #include <memory>
 #include <vector>
 
-#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/event.h"
 #include "webrtc/system_wrappers/include/ref_count.h"
 #include "webrtc/system_wrappers/include/scoped_vector.h"
 #include "webrtc/test/fake_texture_frame.h"
 #include "webrtc/video/send_statistics_proxy.h"
 
-using ::testing::_;
-using ::testing::Invoke;
-using ::testing::NiceMock;
-using ::testing::Return;
-using ::testing::WithArg;
-
 // If an output frame does not arrive in 500ms, the test will fail.
 #define FRAME_TIMEOUT_MS 500
 
 namespace webrtc {
 
-class MockVideoCaptureCallback : public VideoCaptureCallback {
- public:
-  MOCK_METHOD1(DeliverFrame, void(VideoFrame video_frame));
-};
-
 bool EqualFrames(const VideoFrame& frame1, const VideoFrame& frame2);
 bool EqualTextureFrames(const VideoFrame& frame1, const VideoFrame& frame2);
 bool EqualBufferFrames(const VideoFrame& frame1, const VideoFrame& frame2);
 bool EqualFramesVector(const ScopedVector<VideoFrame>& frames1,
                        const ScopedVector<VideoFrame>& frames2);
 VideoFrame* CreateVideoFrame(uint8_t length);
 
 class VideoCaptureInputTest : public ::testing::Test {
  protected:
   VideoCaptureInputTest()
       : stats_proxy_(Clock::GetRealTimeClock(),
                      webrtc::VideoSendStream::Config(nullptr),
                      webrtc::VideoEncoderConfig::ContentType::kRealtimeVideo),
-        mock_frame_callback_(new NiceMock<MockVideoCaptureCallback>),
-        output_frame_event_(false, false) {}
+        capture_event_(false, false) {}
 
   virtual void SetUp() {
-    EXPECT_CALL(*mock_frame_callback_, DeliverFrame(_))
-        .WillRepeatedly(
-            WithArg<0>(Invoke(this, &VideoCaptureInputTest::AddOutputFrame)));
-
     overuse_detector_.reset(
         new OveruseFrameDetector(Clock::GetRealTimeClock(), CpuOveruseOptions(),
                                  nullptr, nullptr, &stats_proxy_));
-    input_.reset(new internal::VideoCaptureInput(mock_frame_callback_.get(),
-                                                 nullptr, &stats_proxy_,
-                                                 overuse_detector_.get()));
+    input_.reset(new internal::VideoCaptureInput(
+        &capture_event_, nullptr, &stats_proxy_, overuse_detector_.get()));
   }
 
   void AddInputFrame(VideoFrame* frame) {
     input_->IncomingCapturedFrame(*frame);
   }
 
-  void AddOutputFrame(const VideoFrame& frame) {
-    if (frame.native_handle() == NULL)
-      output_frame_ybuffers_.push_back(frame.buffer(kYPlane));
+  void WaitOutputFrame() {
+    EXPECT_TRUE(capture_event_.Wait(FRAME_TIMEOUT_MS));
+    VideoFrame frame;
+    EXPECT_TRUE(input_->GetVideoFrame(&frame));
+    if (!frame.native_handle()) {
+      output_frame_ybuffers_.push_back(
+          static_cast<const VideoFrame*>(&frame)->buffer(kYPlane));
+    }
     output_frames_.push_back(new VideoFrame(frame));
-    output_frame_event_.Set();
-  }
-
-  void WaitOutputFrame() {
-    EXPECT_TRUE(output_frame_event_.Wait(FRAME_TIMEOUT_MS));
   }
 
   SendStatisticsProxy stats_proxy_;
 
-  std::unique_ptr<MockVideoCaptureCallback> mock_frame_callback_;
+  rtc::Event capture_event_;
 
   std::unique_ptr<OveruseFrameDetector> overuse_detector_;
 
   // Used to send input capture frames to VideoCaptureInput.
   std::unique_ptr<internal::VideoCaptureInput> input_;
 
   // Input capture frames of VideoCaptureInput.
   ScopedVector<VideoFrame> input_frames_;
 
-  // Indicate an output frame has arrived.
-  rtc::Event output_frame_event_;
-
   // Output delivered frames of VideoCaptureInput.
   ScopedVector<VideoFrame> output_frames_;
 
   // The pointers of Y plane buffers of output frames. This is used to verify
   // the frame are swapped and not copied.
   std::vector<const uint8_t*> output_frame_ybuffers_;
 };
 
 TEST_F(VideoCaptureInputTest, DoesNotRetainHandleNorCopyBuffer) {
   // Indicate an output frame has arrived.
@@ skipping 49 matching lines @@
   input_frames_.push_back(CreateVideoFrame(0));
 
   input_frames_[0]->set_ntp_time_ms(17);
   AddInputFrame(input_frames_[0]);
   WaitOutputFrame();
   EXPECT_EQ(output_frames_[0]->timestamp(),
             input_frames_[0]->ntp_time_ms() * 90);
 
   // Repeat frame with the same NTP timestamp should drop.
   AddInputFrame(input_frames_[0]);
-  EXPECT_FALSE(output_frame_event_.Wait(FRAME_TIMEOUT_MS));
+  EXPECT_FALSE(capture_event_.Wait(FRAME_TIMEOUT_MS));
 
   // As should frames with a decreased NTP timestamp.
   input_frames_[0]->set_ntp_time_ms(input_frames_[0]->ntp_time_ms() - 1);
   AddInputFrame(input_frames_[0]);
-  EXPECT_FALSE(output_frame_event_.Wait(FRAME_TIMEOUT_MS));
+  EXPECT_FALSE(capture_event_.Wait(FRAME_TIMEOUT_MS));
 
   // But delivering with an increased NTP timestamp should succeed.
   input_frames_[0]->set_ntp_time_ms(4711);
   AddInputFrame(input_frames_[0]);
   WaitOutputFrame();
   EXPECT_EQ(output_frames_[1]->timestamp(),
             input_frames_[0]->ntp_time_ms() * 90);
 }
 
 TEST_F(VideoCaptureInputTest, TestTextureFrames) {
@@ skipping 104 matching lines @@
   const int kSizeY = width * height * 2;
   uint8_t buffer[kSizeY];
   memset(buffer, data, kSizeY);
   frame->CreateFrame(buffer, buffer, buffer, width, height, width, width / 2,
                      width / 2, kVideoRotation_0);
   frame->set_render_time_ms(data);
   return frame;
 }
 
 }  // namespace webrtc