OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 17 matching lines...) Expand all Loading... |
28 class MediaController : public webrtc::MediaControllerInterface, | 28 class MediaController : public webrtc::MediaControllerInterface, |
29 public sigslot::has_slots<> { | 29 public sigslot::has_slots<> { |
30 public: | 30 public: |
31 MediaController(const cricket::MediaConfig& media_config, | 31 MediaController(const cricket::MediaConfig& media_config, |
32 rtc::Thread* worker_thread, | 32 rtc::Thread* worker_thread, |
33 cricket::ChannelManager* channel_manager) | 33 cricket::ChannelManager* channel_manager) |
34 : worker_thread_(worker_thread), | 34 : worker_thread_(worker_thread), |
35 media_config_(media_config), | 35 media_config_(media_config), |
36 channel_manager_(channel_manager) { | 36 channel_manager_(channel_manager) { |
37 RTC_DCHECK(worker_thread); | 37 RTC_DCHECK(worker_thread); |
38 worker_thread_->Invoke<void>( | 38 worker_thread_->Invoke<void>(RTC_FROM_HERE, |
39 rtc::Bind(&MediaController::Construct_w, this, | 39 rtc::Bind(&MediaController::Construct_w, this, |
40 channel_manager_->media_engine())); | 40 channel_manager_->media_engine())); |
41 } | 41 } |
42 ~MediaController() override { | 42 ~MediaController() override { |
43 Close(); | 43 Close(); |
44 } | 44 } |
45 | 45 |
46 // webrtc::MediaControllerInterface implementation. | 46 // webrtc::MediaControllerInterface implementation. |
47 void Close() override { | 47 void Close() override { |
48 worker_thread_->Invoke<void>(rtc::Bind(&MediaController::Close_w, this)); | 48 worker_thread_->Invoke<void>(RTC_FROM_HERE, |
| 49 rtc::Bind(&MediaController::Close_w, this)); |
49 } | 50 } |
50 webrtc::Call* call_w() override { | 51 webrtc::Call* call_w() override { |
51 RTC_DCHECK(worker_thread_->IsCurrent()); | 52 RTC_DCHECK(worker_thread_->IsCurrent()); |
52 if (!call_) { | 53 if (!call_) { |
53 call_.reset(webrtc::Call::Create(call_config_)); | 54 call_.reset(webrtc::Call::Create(call_config_)); |
54 } | 55 } |
55 return call_.get(); | 56 return call_.get(); |
56 } | 57 } |
57 cricket::ChannelManager* channel_manager() const override { | 58 cricket::ChannelManager* channel_manager() const override { |
58 return channel_manager_; | 59 return channel_manager_; |
(...skipping 26 matching lines...) Expand all Loading... |
85 | 86 |
86 namespace webrtc { | 87 namespace webrtc { |
87 | 88 |
88 MediaControllerInterface* MediaControllerInterface::Create( | 89 MediaControllerInterface* MediaControllerInterface::Create( |
89 const cricket::MediaConfig& config, | 90 const cricket::MediaConfig& config, |
90 rtc::Thread* worker_thread, | 91 rtc::Thread* worker_thread, |
91 cricket::ChannelManager* channel_manager) { | 92 cricket::ChannelManager* channel_manager) { |
92 return new MediaController(config, worker_thread, channel_manager); | 93 return new MediaController(config, worker_thread, channel_manager); |
93 } | 94 } |
94 } // namespace webrtc | 95 } // namespace webrtc |
OLD | NEW |