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

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

Issue 2772043002: Revert of WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType (Closed)
Patch Set: Created 3 years, 9 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 channel()->SetBitRate(bitrate_bps, probing_interval_ms); 166 channel()->SetBitRate(bitrate_bps, probing_interval_ms);
167 } 167 }
168 168
169 void ChannelProxy::SetRecPayloadType(int payload_type, 169 void ChannelProxy::SetRecPayloadType(int payload_type,
170 const SdpAudioFormat& format) { 170 const SdpAudioFormat& format) {
171 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 171 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
172 const int result = channel()->SetRecPayloadType(payload_type, format); 172 const int result = channel()->SetRecPayloadType(payload_type, format);
173 RTC_DCHECK_EQ(0, result); 173 RTC_DCHECK_EQ(0, result);
174 } 174 }
175 175
176 void ChannelProxy::SetReceiveCodecs(
177 const std::map<int, SdpAudioFormat>& codecs) {
178 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
179 channel()->SetReceiveCodecs(codecs);
180 }
181
182 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) { 176 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) {
183 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 177 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
184 channel()->SetSink(std::move(sink)); 178 channel()->SetSink(std::move(sink));
185 } 179 }
186 180
187 void ChannelProxy::SetInputMute(bool muted) { 181 void ChannelProxy::SetInputMute(bool muted) {
188 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 182 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
189 channel()->SetInputMute(muted); 183 channel()->SetInputMute(muted);
190 } 184 }
191 185
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 channel()->OnTwccBasedUplinkPacketLossRate(packet_loss_rate); 372 channel()->OnTwccBasedUplinkPacketLossRate(packet_loss_rate);
379 } 373 }
380 374
381 void ChannelProxy::OnRecoverableUplinkPacketLossRate( 375 void ChannelProxy::OnRecoverableUplinkPacketLossRate(
382 float recoverable_packet_loss_rate) { 376 float recoverable_packet_loss_rate) {
383 // TODO(elad.alon): This fails in UT; fix and uncomment. 377 // TODO(elad.alon): This fails in UT; fix and uncomment.
384 // RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 378 // RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
385 channel()->OnRecoverableUplinkPacketLossRate(recoverable_packet_loss_rate); 379 channel()->OnRecoverableUplinkPacketLossRate(recoverable_packet_loss_rate);
386 } 380 }
387 381
388 void ChannelProxy::RegisterLegacyCodecs() {
389 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
390 channel()->RegisterLegacyCodecs();
391 }
392
393 Channel* ChannelProxy::channel() const { 382 Channel* ChannelProxy::channel() const {
394 RTC_DCHECK(channel_owner_.channel()); 383 RTC_DCHECK(channel_owner_.channel());
395 return channel_owner_.channel(); 384 return channel_owner_.channel();
396 } 385 }
397 386
398 } // namespace voe 387 } // namespace voe
399 } // namespace webrtc 388 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698