MediaController/Call instantiation.

talk/session/media/channelmanager.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 22 matching lines @@
 
 #include "talk/media/base/capturemanager.h"
 #include "talk/media/base/mediaengine.h"
 #include "webrtc/p2p/base/session.h"
 #include "talk/session/media/voicechannel.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/sigslotrepeater.h"
 #include "webrtc/base/thread.h"
 
+namespace webrtc {
+class MediaController;
+}
 namespace cricket {
 
 const int kDefaultAudioDelayOffset = 0;
 
 class VoiceChannel;
 class VoiceProcessor;
 
 // 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
@@ skipping 21 matching lines @@
 
   // 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) {
     if (initialized_) return false;
     worker_thread_ = thread;
     return true;
   }
 
+  MediaEngineInterface* media_engine() { return media_engine_.get(); }
+
   // Gets capabilities. Can be called prior to starting the media engine.
   int GetCapabilities();
 
   // Retrieves the list of supported audio & video codec types.
   // Can be called before starting the media engine.
   void GetSupportedAudioCodecs(std::vector<AudioCodec>* codecs) const;
   void GetSupportedAudioRtpHeaderExtensions(RtpHeaderExtensions* ext) const;
   void GetSupportedVideoCodecs(std::vector<VideoCodec>* codecs) const;
   void GetSupportedVideoRtpHeaderExtensions(RtpHeaderExtensions* ext) const;
   void GetSupportedDataCodecs(std::vector<DataCodec>* codecs) const;
 
   // Indicates whether the media engine is started.
   bool initialized() const { return initialized_; }
   // Starts up the media engine.
   bool Init();
   // Shuts down the media engine.
   void Terminate();
 
   // The operations below all occur on the worker thread.
 
   // Creates a voice channel, to be associated with the specified session.
   VoiceChannel* CreateVoiceChannel(BaseSession* session,
                                    const std::string& content_name,
                                    bool rtcp,
+                                   webrtc::MediaController* media_controller,

[pthatcher1, 2015/09/09 07:27:43]

I think it should be the first argument.  

[the sun, 2015/09/09 08:24:51]

Done.

                                    const AudioOptions& options);
   // Destroys a voice channel created with the Create API.
-  void DestroyVoiceChannel(VoiceChannel* voice_channel,
-                           VideoChannel* video_channel);
-  // TODO(pbos): Remove as soon as all call sites specify VideoOptions.
-  VideoChannel* CreateVideoChannel(BaseSession* session,
-                                   const std::string& content_name,
-                                   bool rtcp,
-                                   VoiceChannel* voice_channel);
+  void DestroyVoiceChannel(VoiceChannel* voice_channel);
   // Creates a video channel, synced with the specified voice channel, and
   // associated with the specified session.
   VideoChannel* CreateVideoChannel(BaseSession* session,
                                    const std::string& content_name,
                                    bool rtcp,
-                                   const VideoOptions& options,
-                                   VoiceChannel* voice_channel);
+                                   webrtc::MediaController* media_controller,
+                                   const VideoOptions& options);
   // Destroys a video channel created with the Create API.
   void DestroyVideoChannel(VideoChannel* video_channel);
   DataChannel* CreateDataChannel(
       BaseSession* session, const std::string& content_name,
       bool rtcp, DataChannelType data_channel_type);
   // Destroys a data channel created with the Create API.
   void DestroyDataChannel(DataChannel* data_channel);
 
   // Indicates whether any channels exist.
   bool has_channels() const {
@@ skipping 109 matching lines @@
                  DataEngineInterface* dme,
                  DeviceManagerInterface* dm,
                  CaptureManager* cm,
                  rtc::Thread* worker_thread);
   bool InitMediaEngine_w();
   void DestructorDeletes_w();
   void Terminate_w();
   VoiceChannel* CreateVoiceChannel_w(BaseSession* session,
                                      const std::string& content_name,
                                      bool rtcp,
+                                     webrtc::MediaController* media_controller,
                                      const AudioOptions& options);
-  void DestroyVoiceChannel_w(VoiceChannel* voice_channel,
-                             VideoChannel* video_channel);
+  void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
   VideoChannel* CreateVideoChannel_w(BaseSession* session,
                                      const std::string& content_name,
                                      bool rtcp,
-                                     const VideoOptions& options,
-                                     VoiceChannel* voice_channel);
+                                     webrtc::MediaController* media_controller,
+                                     const VideoOptions& options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
   DataChannel* CreateDataChannel_w(
       BaseSession* session, const std::string& content_name,
       bool rtcp, DataChannelType data_channel_type);
   void DestroyDataChannel_w(DataChannel* data_channel);
   bool SetAudioOptions_w(const AudioOptions& options, int delay_offset,
                          const Device* in_dev, const Device* out_dev);
   bool SetCaptureDevice_w(const Device* cam_device);
   void OnVideoCaptureStateChange(VideoCapturer* capturer,
                                  CaptureState result);
@@ skipping 33 matching lines @@
   // but selected devices while this sting will be empty or contain current
   // selected device.
   // TODO(hellner): refactor the code such that there is no need to keep two
   // strings for video devices that have subtle differences in behavior.
   std::string video_device_name_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_CHANNELMANAGER_H_