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

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

Issue 2110113003: Reland of "Move RtcEventLog object from inside VoiceEngine to Call.", "Fix to make the start/stop f… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 5 months 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') | webrtc/voice_engine/include/voe_codec.h » ('j') | 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 197 RTC_DCHECK(thread_checker_.CalledOnValidThread());
198 return channel()->GetAudioDecoderFactory(); 198 return channel()->GetAudioDecoderFactory();
199 } 199 }
200 200
201 void ChannelProxy::SetChannelOutputVolumeScaling(float scaling) { 201 void ChannelProxy::SetChannelOutputVolumeScaling(float scaling) {
202 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 202 RTC_DCHECK(thread_checker_.CalledOnValidThread());
203 int error = channel()->SetChannelOutputVolumeScaling(scaling); 203 int error = channel()->SetChannelOutputVolumeScaling(scaling);
204 RTC_DCHECK_EQ(0, error); 204 RTC_DCHECK_EQ(0, error);
205 } 205 }
206 206
207 void ChannelProxy::SetRtcEventLog(RtcEventLog* event_log) {
208 RTC_DCHECK(thread_checker_.CalledOnValidThread());
209 channel()->SetRtcEventLog(event_log);
210 }
211
207 Channel* ChannelProxy::channel() const { 212 Channel* ChannelProxy::channel() const {
208 RTC_DCHECK(channel_owner_.channel()); 213 RTC_DCHECK(channel_owner_.channel());
209 return channel_owner_.channel(); 214 return channel_owner_.channel();
210 } 215 }
211 216
212 } // namespace voe 217 } // namespace voe
213 } // namespace webrtc 218 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/include/voe_codec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698