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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
222 max_frame_length_ms); | 222 max_frame_length_ms); |
223 } | 223 } |
224 | 224 |
225 AudioMixer::Source::AudioFrameInfo ChannelProxy::GetAudioFrameWithInfo( | 225 AudioMixer::Source::AudioFrameInfo ChannelProxy::GetAudioFrameWithInfo( |
226 int sample_rate_hz, | 226 int sample_rate_hz, |
227 AudioFrame* audio_frame) { | 227 AudioFrame* audio_frame) { |
228 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_); | 228 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_); |
229 return channel()->GetAudioFrameWithInfo(sample_rate_hz, audio_frame); | 229 return channel()->GetAudioFrameWithInfo(sample_rate_hz, audio_frame); |
230 } | 230 } |
231 | 231 |
232 int ChannelProxy::NeededFrequency() const { | 232 int ChannelProxy::NeededFrequency() const { |
the sun
2016/12/01 09:16:55
Comment about thread affinity missing
michaelt
2016/12/05 15:08:49
I think we should fix this in a separate CL, since
| |
233 return static_cast<int>(channel()->NeededFrequency(-1)); | 233 return static_cast<int>(channel()->NeededFrequency(-1)); |
234 } | 234 } |
235 | 235 |
236 void ChannelProxy::SetTransportOverhead(int transport_overhead_per_packet) { | 236 void ChannelProxy::SetTransportOverhead(int transport_overhead_per_packet) { |
237 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 237 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
238 channel()->SetTransportOverhead(transport_overhead_per_packet); | 238 channel()->SetTransportOverhead(transport_overhead_per_packet); |
239 } | 239 } |
240 | 240 |
241 void ChannelProxy::AssociateSendChannel( | 241 void ChannelProxy::AssociateSendChannel( |
242 const ChannelProxy& send_channel_proxy) { | 242 const ChannelProxy& send_channel_proxy) { |
243 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 243 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
244 channel()->set_associate_send_channel(send_channel_proxy.channel_owner_); | 244 channel()->set_associate_send_channel(send_channel_proxy.channel_owner_); |
245 } | 245 } |
246 | 246 |
247 void ChannelProxy::DisassociateSendChannel() { | 247 void ChannelProxy::DisassociateSendChannel() { |
248 RTC_DCHECK(thread_checker_.CalledOnValidThread()); | 248 RTC_DCHECK(thread_checker_.CalledOnValidThread()); |
249 channel()->set_associate_send_channel(ChannelOwner(nullptr)); | 249 channel()->set_associate_send_channel(ChannelOwner(nullptr)); |
250 } | 250 } |
251 | 251 |
252 void ChannelProxy::UpdateSmoothedBitrate() { | |
253 // May be called on either worker thread or network thread. | |
254 channel()->UpdateSmoothedBitrate(); | |
255 } | |
256 | |
252 Channel* ChannelProxy::channel() const { | 257 Channel* ChannelProxy::channel() const { |
253 RTC_DCHECK(channel_owner_.channel()); | 258 RTC_DCHECK(channel_owner_.channel()); |
254 return channel_owner_.channel(); | 259 return channel_owner_.channel(); |
255 } | 260 } |
256 | 261 |
257 } // namespace voe | 262 } // namespace voe |
258 } // namespace webrtc | 263 } // namespace webrtc |
OLD | NEW |