Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: talk/app/webrtc/mediacontroller.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanup Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/mediacontroller.h" 28 #include "talk/app/webrtc/mediacontroller.h"
29 29
30 #include "talk/session/media/channelmanager.h"
30 #include "webrtc/base/bind.h" 31 #include "webrtc/base/bind.h"
31 #include "webrtc/base/checks.h" 32 #include "webrtc/base/checks.h"
32 #include "webrtc/call.h"
33 33
34 namespace { 34 namespace {
35 35
36 const int kMinBandwidthBps = 30000; 36 const int kMinBandwidthBps = 30000;
37 const int kStartBandwidthBps = 300000; 37 const int kStartBandwidthBps = 300000;
38 const int kMaxBandwidthBps = 2000000; 38 const int kMaxBandwidthBps = 2000000;
39 39
40 class MediaController : public webrtc::MediaControllerInterface { 40 class MediaController : public webrtc::MediaControllerInterface,
41 public sigslot::has_slots<> {
41 public: 42 public:
42 MediaController(rtc::Thread* worker_thread, 43 MediaController(rtc::Thread* worker_thread,
43 webrtc::VoiceEngine* voice_engine) 44 cricket::ChannelManager* channel_manager)
44 : worker_thread_(worker_thread) { 45 : worker_thread_(worker_thread), channel_manager_(channel_manager) {
45 RTC_DCHECK(nullptr != worker_thread); 46 RTC_DCHECK(nullptr != worker_thread);
46 worker_thread_->Invoke<void>( 47 worker_thread_->Invoke<void>(
47 rtc::Bind(&MediaController::Construct_w, this, voice_engine)); 48 rtc::Bind(&MediaController::Construct_w, this,
49 channel_manager_->media_engine()->GetVoE()));
48 } 50 }
49 ~MediaController() override { 51 ~MediaController() override {
50 worker_thread_->Invoke<void>( 52 worker_thread_->Invoke<void>(
51 rtc::Bind(&MediaController::Destruct_w, this)); 53 rtc::Bind(&MediaController::Destruct_w, this));
52 } 54 }
53 55
54 webrtc::Call* call_w() override { 56 webrtc::Call* call_w() override {
55 RTC_DCHECK(worker_thread_->IsCurrent()); 57 RTC_DCHECK(worker_thread_->IsCurrent());
56 return call_.get(); 58 return call_.get();
57 } 59 }
58 60
61 cricket::ChannelManager* channel_manager() const override {
62 return channel_manager_;
63 }
64
59 private: 65 private:
60 void Construct_w(webrtc::VoiceEngine* voice_engine) { 66 void Construct_w(webrtc::VoiceEngine* voice_engine) {
61 RTC_DCHECK(worker_thread_->IsCurrent()); 67 RTC_DCHECK(worker_thread_->IsCurrent());
62 webrtc::Call::Config config; 68 webrtc::Call::Config config;
63 config.voice_engine = voice_engine; 69 config.voice_engine = voice_engine;
64 config.bitrate_config.min_bitrate_bps = kMinBandwidthBps; 70 config.bitrate_config.min_bitrate_bps = kMinBandwidthBps;
65 config.bitrate_config.start_bitrate_bps = kStartBandwidthBps; 71 config.bitrate_config.start_bitrate_bps = kStartBandwidthBps;
66 config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps; 72 config.bitrate_config.max_bitrate_bps = kMaxBandwidthBps;
67 call_.reset(webrtc::Call::Create(config)); 73 call_.reset(webrtc::Call::Create(config));
68 } 74 }
69 void Destruct_w() { 75 void Destruct_w() {
70 RTC_DCHECK(worker_thread_->IsCurrent()); 76 RTC_DCHECK(worker_thread_->IsCurrent());
71 call_.reset(nullptr); 77 call_.reset();
72 } 78 }
73 79
74 rtc::Thread* worker_thread_; 80 rtc::Thread* const worker_thread_;
81 cricket::ChannelManager* const channel_manager_;
75 rtc::scoped_ptr<webrtc::Call> call_; 82 rtc::scoped_ptr<webrtc::Call> call_;
76 83
77 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController); 84 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MediaController);
78 }; 85 };
79 } // namespace { 86 } // namespace {
80 87
81 namespace webrtc { 88 namespace webrtc {
82 89
83 MediaControllerInterface* MediaControllerInterface::Create( 90 MediaControllerInterface* MediaControllerInterface::Create(
84 rtc::Thread* worker_thread, webrtc::VoiceEngine* voice_engine) { 91 rtc::Thread* worker_thread,
85 return new MediaController(worker_thread, voice_engine); 92 cricket::ChannelManager* channel_manager) {
93 return new MediaController(worker_thread, channel_manager);
86 } 94 }
87 } // namespace webrtc 95 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698