Wire up transport sequence number / send time callbacks to webrtc via libjingle.

talk/app/webrtc/mediacontroller.cc

 /*
  * 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,
@@ skipping 11 matching lines @@
  * 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 "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/call.h"
 
 namespace {
 
 const int kMinBandwidthBps = 30000;
 const int kStartBandwidthBps = 300000;
 const int kMaxBandwidthBps = 2000000;
 
-class MediaController : public webrtc::MediaControllerInterface {
+class MediaController : public webrtc::MediaControllerInterface,
+                        public sigslot::has_slots<> {
  public:
-  MediaController(rtc::Thread* worker_thread,
+  MediaController(webrtc::CallFactory* call_factory,
+                  rtc::Thread* worker_thread,
                   webrtc::VoiceEngine* voice_engine)
-      : worker_thread_(worker_thread) {
+      : worker_thread_(worker_thread), call_factory_(call_factory) {
     RTC_DCHECK(nullptr != worker_thread);
     worker_thread_->Invoke<void>(
         rtc::Bind(&MediaController::Construct_w, this, voice_engine));
   }
   ~MediaController() override {
     worker_thread_->Invoke<void>(
         rtc::Bind(&MediaController::Destruct_w, this));
   }
 
   webrtc::Call* call_w() override {
     RTC_DCHECK(worker_thread_->IsCurrent());
     return call_.get();
   }
 
  private:
   void Construct_w(webrtc::VoiceEngine* voice_engine)  {
     RTC_DCHECK(worker_thread_->IsCurrent());
     webrtc::Call::Config config;
     config.voice_engine = voice_engine;
     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));
+    call_.reset(call_factory_->CreateCall(config));
   }
   void Destruct_w() {
     RTC_DCHECK(worker_thread_->IsCurrent());
-    call_.reset(nullptr);
+    call_.reset();
   }
 
-  rtc::Thread* worker_thread_;
+  rtc::Thread* const worker_thread_;
+  webrtc::CallFactory* call_factory_;
   rtc::scoped_ptr<webrtc::Call> call_;
+  std::set<cricket::TransportChannel*> transport_channels_;

[pthatcher1, 2015/10/09 20:57:48]

You don't need this any more, do you?

[stefan-webrtc, 2015/10/10 15:32:51]

Done.

 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController);
 };
 } // namespace {
 
 namespace webrtc {
 
 MediaControllerInterface* MediaControllerInterface::Create(
-    rtc::Thread* worker_thread, webrtc::VoiceEngine* voice_engine) {
-  return new MediaController(worker_thread, voice_engine);
+    webrtc::CallFactory* call_factory,
+    rtc::Thread* worker_thread,
+    webrtc::VoiceEngine* voice_engine) {
+  return new MediaController(call_factory, worker_thread, voice_engine);
 }
 } // namespace webrtc