Remove CaptureManager and related calls in ChannelManager.

webrtc/pc/channelmanager.h

 /*
  *  Copyright 2004 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.
  */
 
 #ifndef WEBRTC_PC_CHANNELMANAGER_H_
 #define WEBRTC_PC_CHANNELMANAGER_H_
 
 #include <string>
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/fileutils.h"
-#include "webrtc/base/sigslotrepeater.h"
 #include "webrtc/base/thread.h"
-#include "webrtc/media/base/capturemanager.h"
 #include "webrtc/media/base/mediaengine.h"
 #include "webrtc/pc/voicechannel.h"
 
 namespace webrtc {
 class MediaControllerInterface;
 }
 namespace cricket {
 
 class VoiceChannel;
 
 // ChannelManager allows the MediaEngine to run on a separate thread, and takes
 // care of marshalling calls between threads. It also creates and keeps track of
 // voice and video channels; by doing so, it can temporarily pause all the
 // channels when a new audio or video device is chosen. The voice and video
 // channels are stored in separate vectors, to easily allow operations on just
 // voice or just video channels.
 // ChannelManager also allows the application to discover what devices it has
 // using device manager.
-class ChannelManager : public rtc::MessageHandler,
-                       public sigslot::has_slots<> {
+class ChannelManager {
  public:
   // For testing purposes. Allows the media engine and data media
   // engine and dev manager to be mocks.  The ChannelManager takes
   // ownership of these objects.
   ChannelManager(MediaEngineInterface* me,
                  DataEngineInterface* dme,
-                 CaptureManager* cm,
                  rtc::Thread* worker);
   // Same as above, but gives an easier default DataEngine.
   ChannelManager(MediaEngineInterface* me,
                  rtc::Thread* worker);
   ~ChannelManager();
 
   // Accessors for the worker thread, allowing it to be set after construction,
   // but before Init. set_worker_thread will return false if called after Init.
   rtc::Thread* worker_thread() const { return worker_thread_; }
   bool set_worker_thread(rtc::Thread* thread) {
@@ skipping 53 matching lines @@
 
   bool GetOutputVolume(int* level);
   bool SetOutputVolume(int level);
   // RTX will be enabled/disabled in engines that support it. The supporting
   // engines will start offering an RTX codec. Must be called before Init().
   bool SetVideoRtxEnabled(bool enable);
 
   // Starts/stops the local microphone and enables polling of the input level.
   bool capturing() const { return capturing_; }
 
-  // Gets capturer's supported formats in a thread safe manner
-  std::vector<cricket::VideoFormat> GetSupportedFormats(
-      VideoCapturer* capturer) const;
-  // The following are done in the new "CaptureManager" style that
-  // all local video capturers, processors, and managers should move to.
-  // TODO(pthatcher): Make methods nicer by having start return a handle that
-  // can be used for stop and restart, rather than needing to pass around
-  // formats a a pseudo-handle.
-  bool StartVideoCapture(VideoCapturer* video_capturer,
-                         const VideoFormat& video_format);
-  bool StopVideoCapture(VideoCapturer* video_capturer,
-                        const VideoFormat& video_format);
-  bool RestartVideoCapture(VideoCapturer* video_capturer,
-                           const VideoFormat& previous_format,
-                           const VideoFormat& desired_format,
-                           CaptureManager::RestartOptions options);
-
-  virtual void AddVideoSink(VideoCapturer* video_capturer,
-                            rtc::VideoSinkInterface<VideoFrame>* sink);
-  virtual void RemoveVideoSink(VideoCapturer* video_capturer,
-                               rtc::VideoSinkInterface<VideoFrame>* sink);
-  bool IsScreencastRunning() const;
-
   // The operations below occur on the main thread.
 
   // Starts AEC dump using existing file, with a specified maximum file size in
   // bytes. When the limit is reached, logging will stop and the file will be
   // closed. If max_size_bytes is set to <= 0, no limit will be used.
   bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes);
 
   // Stops recording AEC dump.
   void StopAecDump();
 
   // Starts RtcEventLog using existing file.
   bool StartRtcEventLog(rtc::PlatformFile file);
 
   // Stops logging RtcEventLog.
   void StopRtcEventLog();
 
-  sigslot::signal2<VideoCapturer*, CaptureState> SignalVideoCaptureStateChange;
-
  private:
   typedef std::vector<VoiceChannel*> VoiceChannels;
   typedef std::vector<VideoChannel*> VideoChannels;
   typedef std::vector<DataChannel*> DataChannels;
 
   void Construct(MediaEngineInterface* me,
                  DataEngineInterface* dme,
-                 CaptureManager* cm,
                  rtc::Thread* worker_thread);
   bool InitMediaEngine_w();
   void DestructorDeletes_w();
   void Terminate_w();
   VoiceChannel* CreateVoiceChannel_w(
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
       bool rtcp,
       const AudioOptions& options);
   void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
   VideoChannel* CreateVideoChannel_w(
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
       bool rtcp,
       const VideoOptions& options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
   DataChannel* CreateDataChannel_w(TransportController* transport_controller,
                                    const std::string& content_name,
                                    bool rtcp,
                                    DataChannelType data_channel_type);
   void DestroyDataChannel_w(DataChannel* data_channel);
-  void OnVideoCaptureStateChange(VideoCapturer* capturer,
-                                 CaptureState result);
-  void GetSupportedFormats_w(
-      VideoCapturer* capturer,
-      std::vector<cricket::VideoFormat>* out_formats) const;
-  bool IsScreencastRunning_w() const;
-  virtual void OnMessage(rtc::Message *message);
 
   rtc::scoped_ptr<MediaEngineInterface> media_engine_;
   rtc::scoped_ptr<DataEngineInterface> data_media_engine_;
-  rtc::scoped_ptr<CaptureManager> capture_manager_;
   bool initialized_;
   rtc::Thread* main_thread_;
   rtc::Thread* worker_thread_;
 
   VoiceChannels voice_channels_;
   VideoChannels video_channels_;
   DataChannels data_channels_;
 
   int audio_output_volume_;
   bool enable_rtx_;
 
   bool capturing_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_PC_CHANNELMANAGER_H_