Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Side by Side Diff: webrtc/voice_engine/channel_proxy.cc

Issue 2397573006: Using AudioOption to enable audio network adaptor. (Closed)
Patch Set: fixing a unittest Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 207 RTC_DCHECK(thread_checker_.CalledOnValidThread());
208 int error = channel()->SetChannelOutputVolumeScaling(scaling); 208 int error = channel()->SetChannelOutputVolumeScaling(scaling);
209 RTC_DCHECK_EQ(0, error); 209 RTC_DCHECK_EQ(0, error);
210 } 210 }
211 211
212 void ChannelProxy::SetRtcEventLog(RtcEventLog* event_log) { 212 void ChannelProxy::SetRtcEventLog(RtcEventLog* event_log) {
213 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 213 RTC_DCHECK(thread_checker_.CalledOnValidThread());
214 channel()->SetRtcEventLog(event_log); 214 channel()->SetRtcEventLog(event_log);
215 } 215 }
216 216
217 void ChannelProxy::EnableAudioNetworkAdaptor(const std::string& config_string) {
218 RTC_DCHECK(thread_checker_.CalledOnValidThread());
219 bool ret = channel()->EnableAudioNetworkAdaptor(config_string);
220 RTC_DCHECK(ret);
221 ;}
222
223 void ChannelProxy::DisableAudioNetworkAdaptor() {
224 RTC_DCHECK(thread_checker_.CalledOnValidThread());
225 channel()->DisableAudioNetworkAdaptor();
226 }
227
228 void ChannelProxy::SetReceiverFrameLengthRange(int min_frame_length_ms,
229 int max_frame_length_ms) {
230 RTC_DCHECK(thread_checker_.CalledOnValidThread());
231 channel()->SetReceiverFrameLengthRange(min_frame_length_ms,
232 max_frame_length_ms);
233 }
234
217 AudioMixer::Source::AudioFrameInfo ChannelProxy::GetAudioFrameWithInfo( 235 AudioMixer::Source::AudioFrameInfo ChannelProxy::GetAudioFrameWithInfo(
218 int sample_rate_hz, 236 int sample_rate_hz,
219 AudioFrame* audio_frame) { 237 AudioFrame* audio_frame) {
220 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_); 238 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
221 return channel()->GetAudioFrameWithInfo(sample_rate_hz, audio_frame); 239 return channel()->GetAudioFrameWithInfo(sample_rate_hz, audio_frame);
222 } 240 }
223 241
224 Channel* ChannelProxy::channel() const { 242 Channel* ChannelProxy::channel() const {
225 RTC_DCHECK(channel_owner_.channel()); 243 RTC_DCHECK(channel_owner_.channel());
226 return channel_owner_.channel(); 244 return channel_owner_.channel();
227 } 245 }
228 246
229 } // namespace voe 247 } // namespace voe
230 } // namespace webrtc 248 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698