Move encoder thread to VideoSendStream.

webrtc/video/video_capture_input.h

Index: webrtc/video/video_capture_input.h
diff --git a/webrtc/video/video_capture_input.h b/webrtc/video/video_capture_input.h
index be265bf9a827c930369fb185c2201f3470cf50be..90d7a316a2e53a2afcc47a0af3b13609764e6df2 100644
--- a/webrtc/video/video_capture_input.h
+++ b/webrtc/video/video_capture_input.h
@@ -34,17 +34,10 @@ 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);
@@ -52,21 +45,14 @@ class VideoCaptureInput : public webrtc::VideoCaptureInput {
 
   void IncomingCapturedFrame(const VideoFrame& video_frame) override;
 
- private:
-  // Thread functions for deliver captured frames to receivers.
-  static bool EncoderThreadFunction(void* obj);
-  bool EncoderProcess();
+  bool GetVideoFrame(VideoFrame* frame);
 
+ private:
   rtc::CriticalSection crit_;
 
-  VideoCaptureCallback* const frame_callback_;
   VideoRenderer* const local_renderer_;
   SendStatisticsProxy* const stats_proxy_;
-
-  rtc::PlatformThread encoder_thread_;

[the sun, 2016/03/03 14:16:46]

Does this mean we're going from one thread per capturer, to one thread per video
send stream? We're seeing some potential problems due to using too many threads.
See: https://bugs.chromium.org/p/chromium/issues/detail?id=582441 - this is
another side of the coin though...

[pbos-webrtc, 2016/03/03 14:25:32]

Nope, this VideoCaptureInput is already one per send stream. And we reasonably
have one per encoder for performance/reduced delay reasons.

-  rtc::Event capture_event_;
-
-  volatile int stop_;
+  rtc::Event* const capture_event_;
 
   VideoFrame captured_frame_ GUARDED_BY(crit_);
   Clock* const clock_;