Move encoder thread to VideoSendStream.

webrtc/video/video_capture_input.h

 /*
  *  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.
  */
 
@@ skipping 16 matching lines @@
 #include "webrtc/typedefs.h"
 #include "webrtc/video_send_stream.h"
 
 namespace webrtc {
 
 class Config;
 class OveruseFrameDetector;
 class SendStatisticsProxy;
 class VideoRenderer;
 
-class VideoCaptureCallback {
- public:
-  virtual ~VideoCaptureCallback() {}
-
-  virtual void DeliverFrame(VideoFrame video_frame) = 0;
-};
-
 namespace internal {
 class VideoCaptureInput : public webrtc::VideoCaptureInput {
  public:
-  VideoCaptureInput(VideoCaptureCallback* frame_callback,
+  VideoCaptureInput(rtc::Event* capture_event,
                     VideoRenderer* local_renderer,
                     SendStatisticsProxy* send_stats_proxy,
                     OveruseFrameDetector* overuse_detector);
   ~VideoCaptureInput();
 
   void IncomingCapturedFrame(const VideoFrame& video_frame) override;
 
+  bool GetVideoFrame(VideoFrame* frame);
+
  private:
-  // Thread functions for deliver captured frames to receivers.
-  static bool EncoderThreadFunction(void* obj);
-  bool EncoderProcess();
-
   rtc::CriticalSection crit_;
 
-  VideoCaptureCallback* const frame_callback_;
   VideoRenderer* const local_renderer_;
   SendStatisticsProxy* const stats_proxy_;
-
-  rtc::PlatformThread encoder_thread_;
-  rtc::Event capture_event_;
-
-  volatile int stop_;
+  rtc::Event* const capture_event_;
 
   VideoFrame captured_frame_ GUARDED_BY(crit_);
   Clock* const clock_;
   // Used to make sure incoming time stamp is increasing for every frame.
   int64_t last_captured_timestamp_;
   // Delta used for translating between NTP and internal timestamps.
   const int64_t delta_ntp_internal_ms_;
 
   OveruseFrameDetector* const overuse_detector_;
 };
 
 }  // namespace internal
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_CAPTURE_INPUT_H_