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 24 matching lines...) Expand all Loading... | |
35 worker_thread_->Invoke<void>( | 35 worker_thread_->Invoke<void>( |
36 rtc::Bind(&MediaController::Construct_w, this, | 36 rtc::Bind(&MediaController::Construct_w, this, |
37 channel_manager_->media_engine())); | 37 channel_manager_->media_engine())); |
38 } | 38 } |
39 ~MediaController() override { | 39 ~MediaController() override { |
40 worker_thread_->Invoke<void>(rtc::Bind(&MediaController::Destruct_w, this)); | 40 worker_thread_->Invoke<void>(rtc::Bind(&MediaController::Destruct_w, this)); |
41 } | 41 } |
42 | 42 |
43 webrtc::Call* call_w() override { | 43 webrtc::Call* call_w() override { |
44 RTC_DCHECK(worker_thread_->IsCurrent()); | 44 RTC_DCHECK(worker_thread_->IsCurrent()); |
45 RTC_DCHECK(call_.get()); | |
the sun
2016/03/21 13:03:08
you need to rebase.
ivoc
2016/03/22 13:44:54
Done, thanks (I removed this line while rebasing).
| |
45 return call_.get(); | 46 return call_.get(); |
46 } | 47 } |
47 | 48 |
48 cricket::ChannelManager* channel_manager() const override { | 49 cricket::ChannelManager* channel_manager() const override { |
49 return channel_manager_; | 50 return channel_manager_; |
50 } | 51 } |
51 const cricket::MediaConfig& config() const override { return config_; } | 52 const cricket::MediaConfig& config() const override { return config_; } |
52 | 53 |
53 private: | 54 private: |
54 void Construct_w(cricket::MediaEngineInterface* media_engine) { | 55 void Construct_w(cricket::MediaEngineInterface* media_engine) { |
(...skipping 22 matching lines...) Expand all Loading... | |
77 | 78 |
78 namespace webrtc { | 79 namespace webrtc { |
79 | 80 |
80 MediaControllerInterface* MediaControllerInterface::Create( | 81 MediaControllerInterface* MediaControllerInterface::Create( |
81 const cricket::MediaConfig& config, | 82 const cricket::MediaConfig& config, |
82 rtc::Thread* worker_thread, | 83 rtc::Thread* worker_thread, |
83 cricket::ChannelManager* channel_manager) { | 84 cricket::ChannelManager* channel_manager) { |
84 return new MediaController(config, worker_thread, channel_manager); | 85 return new MediaController(config, worker_thread, channel_manager); |
85 } | 86 } |
86 } // namespace webrtc | 87 } // namespace webrtc |
OLD | NEW |