| 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 int error = channel()->GetSpeechOutputLevelFullRange(level); | 141 int error = channel()->GetSpeechOutputLevelFullRange(level); |
| 142 RTC_DCHECK_EQ(0, error); | 142 RTC_DCHECK_EQ(0, error); |
| 143 return static_cast<int32_t>(level); | 143 return static_cast<int32_t>(level); |
| 144 } | 144 } |
| 145 | 145 |
| 146 uint32_t ChannelProxy::GetDelayEstimate() const { | 146 uint32_t ChannelProxy::GetDelayEstimate() const { |
| 147 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 147 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 148 return channel()->GetDelayEstimate(); | 148 return channel()->GetDelayEstimate(); |
| 149 } | 149 } |
| 150 | 150 |
| 151 bool ChannelProxy::SetSendTelephoneEventPayloadType(int payload_type) { | 151 bool ChannelProxy::SetSendTelephoneEventPayloadType(int payload_type, |
| 152 int payload_frequency) { |
| 152 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 153 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 153 return channel()->SetSendTelephoneEventPayloadType(payload_type) == 0; | 154 return channel()->SetSendTelephoneEventPayloadType(payload_type, |
| 155 payload_frequency) == 0; |
| 154 } | 156 } |
| 155 | 157 |
| 156 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) { | 158 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) { |
| 157 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 159 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
| 158 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0; | 160 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0; |
| 159 } | 161 } |
| 160 | 162 |
| 161 void ChannelProxy::SetBitrate(int bitrate_bps) { | 163 void ChannelProxy::SetBitrate(int bitrate_bps) { |
| 162 // May be called on different threads and needs to be handled by the channel. | 164 // May be called on different threads and needs to be handled by the channel. |
| 163 channel()->SetBitRate(bitrate_bps); | 165 channel()->SetBitRate(bitrate_bps); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 channel()->SetRtcEventLog(event_log); | 216 channel()->SetRtcEventLog(event_log); |
| 215 } | 217 } |
| 216 | 218 |
| 217 Channel* ChannelProxy::channel() const { | 219 Channel* ChannelProxy::channel() const { |
| 218 RTC_DCHECK(channel_owner_.channel()); | 220 RTC_DCHECK(channel_owner_.channel()); |
| 219 return channel_owner_.channel(); | 221 return channel_owner_.channel(); |
| 220 } | 222 } |
| 221 | 223 |
| 222 } // namespace voe | 224 } // namespace voe |
| 223 } // namespace webrtc | 225 } // namespace webrtc |
| OLD | NEW |