Move encoder thread to VideoSendStream.

webrtc/video/video_capture_input.cc

 /*
  *  Copyright (c) 2012 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 "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
 #include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/modules/video_render/video_render_defines.h"
 #include "webrtc/video/overuse_frame_detector.h"
 #include "webrtc/video/send_statistics_proxy.h"
 #include "webrtc/video/vie_encoder.h"
 
 namespace webrtc {
 
 namespace internal {
-VideoCaptureInput::VideoCaptureInput(VideoCaptureCallback* frame_callback,
+VideoCaptureInput::VideoCaptureInput(rtc::Event* capture_event,
                                      VideoRenderer* local_renderer,
                                      SendStatisticsProxy* stats_proxy,
                                      OveruseFrameDetector* overuse_detector)
-    : frame_callback_(frame_callback),
-      local_renderer_(local_renderer),
+    : local_renderer_(local_renderer),
       stats_proxy_(stats_proxy),
-      encoder_thread_(EncoderThreadFunction, this, "EncoderThread"),
-      capture_event_(false, false),
-      stop_(0),
+      capture_event_(capture_event),
       // TODO(danilchap): Pass clock from outside to ensure it is same clock
       // rtcp module use to calculate offset since last frame captured
       // to estimate rtp timestamp for SenderReport.
       clock_(Clock::GetRealTimeClock()),
       last_captured_timestamp_(0),
       delta_ntp_internal_ms_(clock_->CurrentNtpInMilliseconds() -
                              clock_->TimeInMilliseconds()),
-      overuse_detector_(overuse_detector) {
-  encoder_thread_.Start();
-  encoder_thread_.SetPriority(rtc::kHighPriority);
-}
+      overuse_detector_(overuse_detector) {}
 
 VideoCaptureInput::~VideoCaptureInput() {
-  // Stop the thread.
-  rtc::AtomicOps::ReleaseStore(&stop_, 1);
-  capture_event_.Set();
-  encoder_thread_.Stop();
 }
 
 void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) {
   // TODO(pbos): Remove local rendering, it should be handled by the client code
   // if required.
   if (local_renderer_)
     local_renderer_->RenderFrame(video_frame, 0);
 
   stats_proxy_->OnIncomingFrame(video_frame.width(), video_frame.height());
 
@@ skipping 30 matching lines @@
   }
 
   captured_frame_.ShallowCopy(incoming_frame);
   last_captured_timestamp_ = incoming_frame.ntp_time_ms();
 
   overuse_detector_->FrameCaptured(captured_frame_);
 
   TRACE_EVENT_ASYNC_BEGIN1("webrtc", "Video", video_frame.render_time_ms(),
                            "render_time", video_frame.render_time_ms());
 
-  capture_event_.Set();
+  capture_event_->Set();
 }
 
-bool VideoCaptureInput::EncoderThreadFunction(void* obj) {
-  return static_cast<VideoCaptureInput*>(obj)->EncoderProcess();
-}
+bool VideoCaptureInput::GetVideoFrame(VideoFrame* video_frame) {
+  rtc::CritScope lock(&crit_);
+  if (captured_frame_.IsZeroSize())
+    return false;
 
-bool VideoCaptureInput::EncoderProcess() {
-  static const int kThreadWaitTimeMs = 100;
-  if (capture_event_.Wait(kThreadWaitTimeMs)) {
-    if (rtc::AtomicOps::AcquireLoad(&stop_))
-      return false;
-
-    VideoFrame deliver_frame;
-    {
-      rtc::CritScope lock(&crit_);
-      if (!captured_frame_.IsZeroSize()) {
-        deliver_frame = captured_frame_;
-        captured_frame_.Reset();
-      }
-    }
-    if (!deliver_frame.IsZeroSize()) {
-      frame_callback_->DeliverFrame(deliver_frame);
-    }
-  }
+  *video_frame = captured_frame_;
+  captured_frame_.Reset();
   return true;
 }
 
 }  // namespace internal
 }  // namespace webrtc