Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 153 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 153 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 154 return | 154 return |
| 155 channel()->SendTelephoneEventOutband(event, duration_ms, 10, false) == 0; | 155 channel()->SendTelephoneEventOutband(event, duration_ms, 10, false) == 0; |
| 156 } | 156 } |
| 157 | 157 |
| 158 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) { | 158 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) { |
| 159 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 159 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 160 channel()->SetSink(std::move(sink)); | 160 channel()->SetSink(std::move(sink)); |
| 161 } | 161 } |
| 162 | 162 |
| 163 void ChannelProxy::SetRtcEventLog(RtcEventLog* event_log) { | |
|
the sun
2016/03/21 13:03:09
RTC_DCHECK(thread_checker_.CalledOnValidThread());
ivoc
2016/03/22 13:44:55
Done.
| |
| 164 channel()->SetRtcEventLog(event_log); | |
| 165 } | |
| 166 | |
| 163 Channel* ChannelProxy::channel() const { | 167 Channel* ChannelProxy::channel() const { |
| 164 RTC_DCHECK(channel_owner_.channel()); | 168 RTC_DCHECK(channel_owner_.channel()); |
| 165 return channel_owner_.channel(); | 169 return channel_owner_.channel(); |
| 166 } | 170 } |
| 167 | 171 |
| 168 } // namespace voe | 172 } // namespace voe |
| 169 } // namespace webrtc | 173 } // namespace webrtc |
| OLD | NEW |