MediaController/Call instantiation.

talk/app/webrtc/mediacontroller.cc

Index: talk/app/webrtc/mediacontroller.cc
diff --git a/talk/app/webrtc/mediacontroller.cc b/talk/app/webrtc/mediacontroller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..7c03c35983fbbd41d1620a18b8e7305672e38502
--- /dev/null
+++ b/talk/app/webrtc/mediacontroller.cc
@@ -0,0 +1,83 @@
+/*
+ * libjingle
+ * Copyright 2015 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,
+ *     this list of conditions and the following disclaimer in the documentation
+ *     and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "talk/app/webrtc/mediacontroller.h"
+
+#include "talk/media/base/mediaengine.h"
+#include "talk/media/webrtc/webrtcvideoengine2.h"
+#include "talk/session/media/channel.h"
+#include "webrtc/base/bind.h"
+#include "webrtc/base/checks.h"
+
+namespace webrtc {
+
+const int kMinBandwidthBps = 30000;
+const int kStartBandwidthBps = 300000;
+const int kMaxBandwidthBps = 2000000;
+
+MediaController::MediaController(rtc::Thread* worker_thread,
+                                 cricket::MediaEngineInterface* media_engine)
+    : worker_thread_(worker_thread), video_channel_(nullptr) {
+  DCHECK(nullptr != worker_thread);
+  worker_thread_->Invoke<void>(
+      rtc::Bind(&MediaController::Construct_w, this, media_engine));
+}
+
+MediaController::~MediaController() {
+  worker_thread_->Invoke<void>(rtc::Bind(&MediaController::Destruct_w, this));
+}
+
+void MediaController::set_video_channel(cricket::VideoChannel* video_channel) {
+  rtc::CritScope cs(&critical_section_);
+  video_channel_ = video_channel;

[pthatcher1, 2015/09/02 21:24:22]

WebRtcVideoChannel2 implements webrtc::LoadObserver, so why not just have
set_load_observer(webrtc::LoadObserver* observer) here?  I think that would be a
lot more clean.

[the sun, 2015/09/03 15:00:46]

You have few comments about LoadObserver; let's keep the discussion here.

Indeed, the solution could be a cleaner. I don't think we should add a
Call::set_load_observer() method and start compromising the immutableness of
Call. Instead, if overuse_callback was specified per stream rather than in the
Call::Config, we could maintain the current relationship between
webrtc::VideoSendStream and WViC2 (incidentally get rid of a lock too, in
webrtc::internal::CpuOveruseObserverProxy). Call doesn't do anything smart when
overuse is detected, it merely forwards the information, funneling it through to
the same callback. We could leave it to the client to decide whether that is one
single callback instance or not.

Such a solution would fit well with what we've discussed about breaking Call
apart going forward.

pbos@, what do you think?

+}
+
+void MediaController::OnLoadUpdate(Load load) {
+  rtc::CritScope cs(&critical_section_);
+  if (video_channel_) {
+    cricket::VideoMediaChannel* mch = video_channel_->media_channel();
+    static_cast<cricket::WebRtcVideoChannel2*>(mch)->OnLoadUpdate(load);
+  }
+}
+
+void MediaController::Construct_w(cricket::MediaEngineInterface* media_engine) {
+  DCHECK(nullptr != media_engine);
+  DCHECK(rtc::Thread::Current() == worker_thread_);

[pthatcher1, 2015/09/02 21:24:22]

I think we usually use worker_thread_->IsCurrent() for these checks.

[the sun, 2015/09/03 15:00:46]

Done.

+  webrtc::Call::Config config;
+  config.overuse_callback = this;

[pthatcher1, 2015/09/02 21:24:22]

Instead of passing in a MediaEngineInteface, webrtc::VoiceEngine directly if
that's all that we need?

[the sun, 2015/09/03 15:00:46]

Done.

+  config.voice_engine = media_engine->GetVoE();
+  config.bitrate_config.min_bitrate_bps = kMinBandwidthBps;
+  config.bitrate_config.start_bitrate_bps = kStartBandwidthBps;
+  config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps;
+  call_.reset(webrtc::Call::Create(config));
+}
+
+void MediaController::Destruct_w() {
+  DCHECK(rtc::Thread::Current() == worker_thread_);
+  call_.reset(nullptr);
+}
+}  // namespace webrtc