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

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

Issue 2516993002: Pass SdpAudioFormat through Channel, without converting to CodecInst (Closed)
Patch Set: add TODO Created 3 years, 11 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') | 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) { 146 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) {
147 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 147 RTC_DCHECK(thread_checker_.CalledOnValidThread());
148 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0; 148 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0;
149 } 149 }
150 150
151 void ChannelProxy::SetBitrate(int bitrate_bps, int64_t probing_interval_ms) { 151 void ChannelProxy::SetBitrate(int bitrate_bps, int64_t probing_interval_ms) {
152 // May be called on different threads and needs to be handled by the channel. 152 // May be called on different threads and needs to be handled by the channel.
153 channel()->SetBitRate(bitrate_bps, probing_interval_ms); 153 channel()->SetBitRate(bitrate_bps, probing_interval_ms);
154 } 154 }
155 155
156 void ChannelProxy::SetRecPayloadType(int payload_type,
157 const SdpAudioFormat& format) {
158 RTC_DCHECK(thread_checker_.CalledOnValidThread());
159 const int result = channel()->SetRecPayloadType(payload_type, format);
160 RTC_DCHECK_EQ(0, result);
161 }
162
156 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) { 163 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) {
157 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 164 RTC_DCHECK(thread_checker_.CalledOnValidThread());
158 channel()->SetSink(std::move(sink)); 165 channel()->SetSink(std::move(sink));
159 } 166 }
160 167
161 void ChannelProxy::SetInputMute(bool muted) { 168 void ChannelProxy::SetInputMute(bool muted) {
162 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 169 RTC_DCHECK(thread_checker_.CalledOnValidThread());
163 int error = channel()->SetInputMute(muted); 170 int error = channel()->SetInputMute(muted);
164 RTC_DCHECK_EQ(0, error); 171 RTC_DCHECK_EQ(0, error);
165 } 172 }
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 channel()->SetRtcpRttStats(rtcp_rtt_stats); 261 channel()->SetRtcpRttStats(rtcp_rtt_stats);
255 } 262 }
256 263
257 Channel* ChannelProxy::channel() const { 264 Channel* ChannelProxy::channel() const {
258 RTC_DCHECK(channel_owner_.channel()); 265 RTC_DCHECK(channel_owner_.channel());
259 return channel_owner_.channel(); 266 return channel_owner_.channel();
260 } 267 }
261 268
262 } // namespace voe 269 } // namespace voe
263 } // namespace webrtc 270 } // 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