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

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

Issue 2378143004: Made AudioReceiveStream a mixer participant. (Closed)
Patch Set: Rebase after mixer interface changes. 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
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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) { 217 void ChannelProxy::SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats) {
218 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 218 RTC_DCHECK(thread_checker_.CalledOnValidThread());
219 channel()->SetRtcpRttStats(rtcp_rtt_stats); 219 channel()->SetRtcpRttStats(rtcp_rtt_stats);
220 } 220 }
221 221
222 // From AudioMixer::Source
the sun 2016/10/13 12:16:56 remove comment.
aleloi 2016/10/13 13:34:55 Done.
223 AudioMixer::Source::AudioFrameWithInfo ChannelProxy::GetAudioFrameWithInfo(
224 int sample_rate_hz) {
225 RTC_DCHECK(mixer_callback_thread_checker_.CalledOnValidThread());
226 return channel()->GetAudioFrameWithInfo(sample_rate_hz);
227 }
228
222 Channel* ChannelProxy::channel() const { 229 Channel* ChannelProxy::channel() const {
223 RTC_DCHECK(channel_owner_.channel()); 230 RTC_DCHECK(channel_owner_.channel());
224 return channel_owner_.channel(); 231 return channel_owner_.channel();
225 } 232 }
226 233
227 } // namespace voe 234 } // namespace voe
228 } // namespace webrtc 235 } // namespace webrtc
OLDNEW
« webrtc/voice_engine/channel_proxy.h ('K') | « webrtc/voice_engine/channel_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698