commit 709ed67c38d0a942f3bf3e68e337cc27a27bc353
author Fredrik Solenberg <solenberg@webrtc.org> Tue Sep 15 12:26:33 2015 +0200
committer Fredrik Solenberg <solenberg@webrtc.org> Tue Sep 15 10:26:45 2015 +0000
tree 3ae0b9a103e22f53136118731b450a32888c117a
parent 4ae28a10701c82e7bcdd32f075bb89f43d745c95

Move instantiation of webrtc::Call into a MediaController class so that it can be used for both audio and video media channels.

I'm not super happy with the GetVoE() function added on MediaEngineInterface, but this will eventually be gone, once webrtc::Call owns the shared VoE state (or initially, maps ADM* to an implicitly created VoE).

BUG=webrtc:4690
R=pbos@webrtc.org, pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1269863005 .

Cr-Commit-Position: refs/heads/master@{#9939}

talk/media/base/mediaengine.h

diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h
index 339251f..08addc4 100644
--- a/talk/media/base/mediaengine.h
+++ b/talk/media/base/mediaengine.h
@@ -32,8 +32,6 @@
 #include <CoreAudio/CoreAudio.h>
 #endif
 
-#include <limits.h>
-
 #include <string>
 #include <vector>
 
@@ -51,6 +49,11 @@
 #define DISABLE_MEDIA_ENGINE_FACTORY
 #endif
 
+namespace webrtc {
+class Call;
+class VoiceEngine;
+}
+
 namespace cricket {
 
 class VideoCapturer;
@@ -73,15 +76,19 @@
   virtual void Terminate() = 0;
   // Returns what the engine is capable of, as a set of Capabilities, above.
   virtual int GetCapabilities() = 0;
+  // TODO(solenberg): Remove once VoE API refactoring is done.
+  virtual webrtc::VoiceEngine* GetVoE() = 0;
 
   // MediaChannel creation
   // Creates a voice media channel. Returns NULL on failure.
-  virtual VoiceMediaChannel* CreateChannel(const AudioOptions& options) = 0;
+  virtual VoiceMediaChannel* CreateChannel(
+      webrtc::Call* call,
+      const AudioOptions& options) = 0;
   // Creates a video media channel, paired with the specified voice channel.
   // Returns NULL on failure.
   virtual VideoMediaChannel* CreateVideoChannel(
-      const VideoOptions& options,
-      VoiceMediaChannel* voice_media_channel) = 0;
+      webrtc::Call* call,
+      const VideoOptions& options) = 0;
 
   // Configuration
   // Gets global audio options.
@@ -162,7 +169,6 @@
 template<class VOICE, class VIDEO>
 class CompositeMediaEngine : public MediaEngineInterface {
  public:
-  CompositeMediaEngine() : video_(&voice_) {}
   virtual ~CompositeMediaEngine() {}
   virtual bool Init(rtc::Thread* worker_thread) {
     if (!voice_.Init(worker_thread))
@@ -177,12 +183,16 @@
   virtual int GetCapabilities() {
     return (voice_.GetCapabilities() | video_.GetCapabilities());
   }
-  virtual VoiceMediaChannel* CreateChannel(const AudioOptions& options) {
-    return voice_.CreateChannel(options);
+  virtual webrtc::VoiceEngine* GetVoE() {
+    return voice_.GetVoE();
   }
-  virtual VideoMediaChannel* CreateVideoChannel(const VideoOptions& options,
-                                                VoiceMediaChannel* channel) {
-    return video_.CreateChannel(options, channel);
+  virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
+                                           const AudioOptions& options) {
+    return voice_.CreateChannel(call, options);
+  }
+  virtual VideoMediaChannel* CreateVideoChannel(webrtc::Call* call,
+                                                const VideoOptions& options) {
+    return video_.CreateChannel(call, options);
   }
 
   virtual AudioOptions GetAudioOptions() const {