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

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

Issue 2378143004: Made AudioReceiveStream a mixer participant. (Closed)
Patch Set: Changed 'ssrc' into 'Ssrc' because of change upstream. Created 4 years, 2 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/voice_engine.gyp » ('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 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 AudioMixer::Source::AudioFrameWithInfo ChannelProxy::GetAudioFrameWithInfo(
218 int sample_rate_hz) {
219 RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
220 return channel()->GetAudioFrameWithInfo(sample_rate_hz);
221 }
222
217 Channel* ChannelProxy::channel() const { 223 Channel* ChannelProxy::channel() const {
218 RTC_DCHECK(channel_owner_.channel()); 224 RTC_DCHECK(channel_owner_.channel());
219 return channel_owner_.channel(); 225 return channel_owner_.channel();
220 } 226 }
221 227
222 } // namespace voe 228 } // namespace voe
223 } // namespace webrtc 229 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/voice_engine.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698