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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 channel()->SetRtcEventLog(event_log); | 250 channel()->SetRtcEventLog(event_log); |
251 } | 251 } |
252 | 252 |
253 AudioMixer::Source::AudioFrameInfo ChannelProxy::GetAudioFrameWithInfo( | 253 AudioMixer::Source::AudioFrameInfo ChannelProxy::GetAudioFrameWithInfo( |
254 int sample_rate_hz, | 254 int sample_rate_hz, |
255 AudioFrame* audio_frame) { | 255 AudioFrame* audio_frame) { |
256 RTC_DCHECK_RUNS_SERIALIZED(&audio_thread_race_checker_); | 256 RTC_DCHECK_RUNS_SERIALIZED(&audio_thread_race_checker_); |
257 return channel()->GetAudioFrameWithInfo(sample_rate_hz, audio_frame); | 257 return channel()->GetAudioFrameWithInfo(sample_rate_hz, audio_frame); |
258 } | 258 } |
259 | 259 |
260 int ChannelProxy::NeededFrequency() const { | 260 int ChannelProxy::PreferredSampleRate() const { |
261 RTC_DCHECK_RUNS_SERIALIZED(&audio_thread_race_checker_); | 261 RTC_DCHECK_RUNS_SERIALIZED(&audio_thread_race_checker_); |
262 return static_cast<int>(channel()->NeededFrequency(-1)); | 262 return channel()->PreferredSampleRate(); |
263 } | 263 } |
264 | 264 |
265 void ChannelProxy::SetTransportOverhead(int transport_overhead_per_packet) { | 265 void ChannelProxy::SetTransportOverhead(int transport_overhead_per_packet) { |
266 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 266 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
267 channel()->SetTransportOverhead(transport_overhead_per_packet); | 267 channel()->SetTransportOverhead(transport_overhead_per_packet); |
268 } | 268 } |
269 | 269 |
270 void ChannelProxy::AssociateSendChannel( | 270 void ChannelProxy::AssociateSendChannel( |
271 const ChannelProxy& send_channel_proxy) { | 271 const ChannelProxy& send_channel_proxy) { |
272 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 272 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 return channel()->GetSources(); | 332 return channel()->GetSources(); |
333 } | 333 } |
334 | 334 |
335 Channel* ChannelProxy::channel() const { | 335 Channel* ChannelProxy::channel() const { |
336 RTC_DCHECK(channel_owner_.channel()); | 336 RTC_DCHECK(channel_owner_.channel()); |
337 return channel_owner_.channel(); | 337 return channel_owner_.channel(); |
338 } | 338 } |
339 | 339 |
340 } // namespace voe | 340 } // namespace voe |
341 } // namespace webrtc | 341 } // namespace webrtc |
OLD | NEW |