| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 return channel()->SetSendTelephoneEventPayloadType(payload_type, | 147 return channel()->SetSendTelephoneEventPayloadType(payload_type, |
| 148 payload_frequency) == 0; | 148 payload_frequency) == 0; |
| 149 } | 149 } |
| 150 | 150 |
| 151 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) { | 151 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) { |
| 152 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 152 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 153 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0; | 153 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0; |
| 154 } | 154 } |
| 155 | 155 |
| 156 void ChannelProxy::SetBitrate(int bitrate_bps, int64_t probing_interval_ms) { | 156 void ChannelProxy::SetBitrate(int bitrate_bps, int64_t probing_interval_ms) { |
| 157 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread() || | 157 // This method can be called on the worker thread, module process thread |
| 158 module_process_thread_checker_.CalledOnValidThread()); | 158 // or on a TaskQueue via VideoSendStreamImpl::OnEncoderConfigurationChanged. |
| 159 // TODO(solenberg): Figure out a good way to check this or enforce calling |
| 160 // rules. |
| 161 // RTC_DCHECK(worker_thread_checker_.CalledOnValidThread() || |
| 162 // module_process_thread_checker_.CalledOnValidThread()); |
| 159 channel()->SetBitRate(bitrate_bps, probing_interval_ms); | 163 channel()->SetBitRate(bitrate_bps, probing_interval_ms); |
| 160 } | 164 } |
| 161 | 165 |
| 162 void ChannelProxy::SetRecPayloadType(int payload_type, | 166 void ChannelProxy::SetRecPayloadType(int payload_type, |
| 163 const SdpAudioFormat& format) { | 167 const SdpAudioFormat& format) { |
| 164 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 168 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 165 const int result = channel()->SetRecPayloadType(payload_type, format); | 169 const int result = channel()->SetRecPayloadType(payload_type, format); |
| 166 RTC_DCHECK_EQ(0, result); | 170 RTC_DCHECK_EQ(0, result); |
| 167 } | 171 } |
| 168 | 172 |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 362 return channel()->SetSendCNPayloadType(type, frequency) == 0; | 366 return channel()->SetSendCNPayloadType(type, frequency) == 0; |
| 363 } | 367 } |
| 364 | 368 |
| 365 Channel* ChannelProxy::channel() const { | 369 Channel* ChannelProxy::channel() const { |
| 366 RTC_DCHECK(channel_owner_.channel()); | 370 RTC_DCHECK(channel_owner_.channel()); |
| 367 return channel_owner_.channel(); | 371 return channel_owner_.channel(); |
| 368 } | 372 } |
| 369 | 373 |
| 370 } // namespace voe | 374 } // namespace voe |
| 371 } // namespace webrtc | 375 } // namespace webrtc |
| OLD | NEW |