Revert of Replace interface VideoCapturerInput with VideoSinkInterface.

webrtc/video/vie_encoder.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 22 matching lines @@
 
 namespace webrtc {
 
 class ProcessThread;
 class SendStatisticsProxy;
 
 // VieEncoder represent a video encoder that accepts raw video frames as input
 // and produces an encoded bit stream.
 // Usage:
 //  Instantiate.
-//  Call SetSink.
-//  Call SetSource.
+//  Call SetStartRate and SetSink.
 //  Call ConfigureEncoder with the codec settings.
+//  Provide frames to encode by calling IncomingCapturedFrame.
 //  Call Stop() when done.
-class ViEEncoder : public rtc::VideoSinkInterface<VideoFrame>,
+class ViEEncoder : public VideoCaptureInput,
                    public EncodedImageCallback,
                    public VCMSendStatisticsCallback,
                    public CpuOveruseObserver {
  public:
   ViEEncoder(uint32_t number_of_cores,
              SendStatisticsProxy* stats_proxy,
              const webrtc::VideoSendStream::Config::EncoderSettings& settings,
              rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
              LoadObserver* overuse_callback,
              EncodedFrameObserver* encoder_timing);
   ~ViEEncoder();
   // RegisterProcessThread register |module_process_thread| with those objects
   // that use it. Registration has to happen on the thread where
   // |module_process_thread| was created (libjingle's worker thread).
   // TODO(perkj): Replace the use of |module_process_thread| with a TaskQueue.
   void RegisterProcessThread(ProcessThread* module_process_thread);
   void DeRegisterProcessThread();
 
-  void SetSource(rtc::VideoSourceInterface<VideoFrame>* source);
   void SetSink(EncodedImageCallback* sink);
 
   // TODO(perkj): Can we remove VideoCodec.startBitrate ?
   void SetStartBitrate(int start_bitrate_bps);
 
   void ConfigureEncoder(const VideoEncoderConfig& config,
                         size_t max_data_payload_length);
 
   // Permanently stop encoding. After this method has returned, it is
   // guaranteed that no encoded frames will be delivered to the sink.
   void Stop();
 
+  // Implements VideoCaptureInput.
+  // TODO(perkj): Refactor ViEEncoder to inherit rtc::VideoSink instead of
+  // VideoCaptureInput.
+  void IncomingCapturedFrame(const VideoFrame& video_frame) override;
+
   void SendKeyFrame();
 
   // virtual to test EncoderStateFeedback with mocks.
   virtual void OnReceivedIntraFrameRequest(size_t stream_index);
   virtual void OnReceivedSLI(uint8_t picture_id);
   virtual void OnReceivedRPSI(uint64_t picture_id);
 
   void OnBitrateUpdated(uint32_t bitrate_bps,
                         uint8_t fraction_lost,
                         int64_t round_trip_time_ms);
 
  private:
   class EncodeTask;
-  class VideoSourceProxy;
 
   void ConfigureEncoderInternal(const VideoCodec& video_codec,
                                 size_t max_data_payload_length);
 
-  // Implements VideoSinkInterface.
-  void OnFrame(const VideoFrame& video_frame) override;
-
   // Implements VideoSendStatisticsCallback.
   void SendStatistics(uint32_t bit_rate,
                       uint32_t frame_rate) override;
 
   void EncodeVideoFrame(const VideoFrame& frame,
                         int64_t time_when_posted_in_ms);
 
   // Implements EncodedImageCallback.
   EncodedImageCallback::Result OnEncodedImage(
       const EncodedImage& encoded_image,
       const CodecSpecificInfo* codec_specific_info,
       const RTPFragmentationHeader* fragmentation) override;
 
   // webrtc::CpuOveruseObserver implementation.
   void OveruseDetected() override;
   void NormalUsage() override;
 
   bool EncoderPaused() const;
   void TraceFrameDropStart();
   void TraceFrameDropEnd();
 
   rtc::Event shutdown_event_;
 
   const uint32_t number_of_cores_;
-
-  const std::unique_ptr<VideoSourceProxy> source_proxy_;
   EncodedImageCallback* sink_;
   const VideoSendStream::Config::EncoderSettings settings_;
 
   const std::unique_ptr<VideoProcessing> vp_;
   vcm::VideoSender video_sender_ ACCESS_ON(&encoder_queue_);
 
   OveruseFrameDetector overuse_detector_ ACCESS_ON(&encoder_queue_);
   LoadObserver* const load_observer_ ACCESS_ON(&encoder_queue_);
 
   SendStatisticsProxy* const stats_proxy_;
   rtc::VideoSinkInterface<VideoFrame>* const pre_encode_callback_;
   ProcessThread* module_process_thread_;
   rtc::ThreadChecker module_process_thread_checker_;
-  // |thread_checker_| checks that public methods that are related to lifetime
-  // of ViEEncoder are called on the same thread.
-  rtc::ThreadChecker thread_checker_;
 
   VideoCodec encoder_config_ ACCESS_ON(&encoder_queue_);
 
   int encoder_start_bitrate_bps_ ACCESS_ON(&encoder_queue_);
   uint32_t last_observed_bitrate_bps_ ACCESS_ON(&encoder_queue_);
   bool encoder_paused_and_dropped_frame_ ACCESS_ON(&encoder_queue_);
   bool has_received_sli_ ACCESS_ON(&encoder_queue_);
   uint8_t picture_id_sli_ ACCESS_ON(&encoder_queue_);
   bool has_received_rpsi_ ACCESS_ON(&encoder_queue_);
   uint64_t picture_id_rpsi_ ACCESS_ON(&encoder_queue_);
   Clock* const clock_;
 
   rtc::RaceChecker incoming_frame_race_checker_;
   Atomic32 posted_frames_waiting_for_encode_;
   // Used to make sure incoming time stamp is increasing for every frame.
   int64_t last_captured_timestamp_ GUARDED_BY(incoming_frame_race_checker_);
   // Delta used for translating between NTP and internal timestamps.
   const int64_t delta_ntp_internal_ms_;
 
   int64_t last_frame_log_ms_ GUARDED_BY(incoming_frame_race_checker_);
   int captured_frame_count_ ACCESS_ON(&encoder_queue_);
   int dropped_frame_count_ ACCESS_ON(&encoder_queue_);
 
   // All public methods are proxied to |encoder_queue_|. It must must be
   // destroyed first to make sure no tasks are run that use other members.
   rtc::TaskQueue encoder_queue_;
-
-  RTC_DISALLOW_COPY_AND_ASSIGN(ViEEncoder);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_ENCODER_H_