More cleanup of cricket::VideoCapturer Remove unused state CS_PAUSED Remove unused SignalVideoFrame

webrtc/media/base/videocapturer.h

 /*
  *  Copyright (c) 2010 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 20 matching lines @@
 
 namespace cricket {
 
 // Current state of the capturer.
 enum CaptureState {
   CS_STOPPED,    // The capturer has been stopped or hasn't started yet.
   CS_STARTING,   // The capturer is in the process of starting. Note, it may
                  // still fail to start.
   CS_RUNNING,    // The capturer has been started successfully and is now
                  // capturing.
-  CS_PAUSED,     // The capturer has been paused.
   CS_FAILED,     // The capturer failed to start.
 };
 
 class VideoFrame;
 
 struct CapturedFrame {
   static const uint32_t kFrameHeaderSize = 40;  // Size from width to data_size.
   static const uint32_t kUnknownDataSize = 0xFFFFFFFF;
 
   CapturedFrame();
@@ skipping 89 matching lines @@
   bool StartCapturing(const VideoFormat& capture_format);
   // Start the video capturer with the specified capture format.
   // Parameter
   //   capture_format: The caller got this parameter by either calling
   //                   GetSupportedFormats() and selecting one of the supported
   //                   or calling GetBestCaptureFormat().
   // Return
   //   CS_STARTING:  The capturer is trying to start. Success or failure will
   //                 be notified via the |SignalStateChange| callback.
   //   CS_RUNNING:   if the capturer is started and capturing.
-  //   CS_PAUSED:    Will never be returned.
   //   CS_FAILED:    if the capturer failes to start..
   //   CS_NO_DEVICE: if the capturer has no device and fails to start.
   virtual CaptureState Start(const VideoFormat& capture_format) = 0;
 
   // Get the current capture format, which is set by the Start() call.
   // Note that the width and height of the captured frames may differ from the
   // capture format. For example, the capture format is HD but the captured
   // frames may be smaller than HD.
   const VideoFormat* GetCaptureFormat() const {
     return capture_format_.get();
   }
 
-  // Pause the video capturer.
-  // DEPRECATED
-  // TODO(perkj): Remove once Chrome remoting doesn't override this method.
-  virtual bool Pause(bool paused) {
-    RTC_NOTREACHED();
-    return false;
-  }
   // Stop the video capturer.
   virtual void Stop() = 0;
   // Check if the video capturer is running.
   virtual bool IsRunning() = 0;
   CaptureState capture_state() const {
     return capture_state_;
   }
 
   virtual bool GetApplyRotation() { return apply_rotation_; }
 
@@ skipping 40 matching lines @@
   // TODO(nisse): Rename function? Or pass the frame format before
   // adaptation in some other way.
   void GetStats(VideoFormat* last_captured_frame_format);
 
   // Implements VideoSourceInterface
   void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
                        const rtc::VideoSinkWants& wants) override;
   void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
 
  protected:
-  // Signal the captured and possibly adapted frame to downstream consumers
-  // such as the encoder.
-  // TODO(perkj): Remove once it is not used by remoting in Chrome.
-  sigslot::signal2<VideoCapturer*, const VideoFrame*,
-                    sigslot::multi_threaded_local> SignalVideoFrame;
-
   // OnSinkWantsChanged can be overridden to change the default behavior
   // when a sink changes its VideoSinkWants by calling AddOrUpdateSink.
   virtual void OnSinkWantsChanged(const rtc::VideoSinkWants& wants);
 
   // Callback attached to SignalFrameCaptured where SignalVideoFrames is called.
   void OnFrameCaptured(VideoCapturer* video_capturer,
                        const CapturedFrame* captured_frame);
 
-  // Callback attached to SignalVideoFrame.
-  // TODO(perkj): Remove once SignalVideoFrame is removed.
+  // Called when a frame has been captured and converted to a VideoFrame.
+  // OnFrame can be called directly by an implementation that does not use
+  // SignalFrameCaptured or OnFrameCaptured.
   void OnFrame(VideoCapturer* capturer, const VideoFrame* frame);
 
   CoordinatedVideoAdapter* video_adapter() { return &video_adapter_; }
 
   void SetCaptureState(CaptureState state);
 
   // subclasses override this virtual method to provide a vector of fourccs, in
   // order of preference, that are expected by the media engine.
   virtual bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) = 0;
 
@@ skipping 61 matching lines @@
 
   // Whether capturer should apply rotation to the frame before signaling it.
   bool apply_rotation_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_