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

Side by Side Diff: webrtc/audio/audio_send_stream.cc

Issue 2987763003: Make ~webrtc::AudioSendStream public, and s/config()/GetConfig(), as well as make public. (Closed)
Patch Set: CR response Created 3 years, 4 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/audio/audio_send_stream.h ('k') | webrtc/call/audio_send_stream.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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 AudioSendStream::~AudioSendStream() { 119 AudioSendStream::~AudioSendStream() {
120 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 120 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
121 LOG(LS_INFO) << "~AudioSendStream: " << config_.ToString(); 121 LOG(LS_INFO) << "~AudioSendStream: " << config_.ToString();
122 transport_->send_side_cc()->DeRegisterPacketFeedbackObserver(this); 122 transport_->send_side_cc()->DeRegisterPacketFeedbackObserver(this);
123 channel_proxy_->DeRegisterExternalTransport(); 123 channel_proxy_->DeRegisterExternalTransport();
124 channel_proxy_->ResetSenderCongestionControlObjects(); 124 channel_proxy_->ResetSenderCongestionControlObjects();
125 channel_proxy_->SetRtcEventLog(nullptr); 125 channel_proxy_->SetRtcEventLog(nullptr);
126 channel_proxy_->SetRtcpRttStats(nullptr); 126 channel_proxy_->SetRtcpRttStats(nullptr);
127 } 127 }
128 128
129 const webrtc::AudioSendStream::Config& AudioSendStream::GetConfig() const {
130 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
131 return config_;
132 }
133
129 void AudioSendStream::Reconfigure( 134 void AudioSendStream::Reconfigure(
130 const webrtc::AudioSendStream::Config& new_config) { 135 const webrtc::AudioSendStream::Config& new_config) {
131 ConfigureStream(this, new_config, false); 136 ConfigureStream(this, new_config, false);
132 } 137 }
133 138
134 void AudioSendStream::ConfigureStream( 139 void AudioSendStream::ConfigureStream(
135 webrtc::internal::AudioSendStream* stream, 140 webrtc::internal::AudioSendStream* stream,
136 const webrtc::AudioSendStream::Config& new_config, 141 const webrtc::AudioSendStream::Config& new_config,
137 bool first_time) { 142 bool first_time) {
138 LOG(LS_INFO) << "AudioSendStream::Configuring: " << new_config.ToString(); 143 LOG(LS_INFO) << "AudioSendStream::Configuring: " << new_config.ToString();
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 // the previously sent value is no longer relevant. This will be taken care 403 // the previously sent value is no longer relevant. This will be taken care
399 // of with some refactoring which is now being done. 404 // of with some refactoring which is now being done.
400 if (plr) { 405 if (plr) {
401 channel_proxy_->OnTwccBasedUplinkPacketLossRate(*plr); 406 channel_proxy_->OnTwccBasedUplinkPacketLossRate(*plr);
402 } 407 }
403 if (rplr) { 408 if (rplr) {
404 channel_proxy_->OnRecoverableUplinkPacketLossRate(*rplr); 409 channel_proxy_->OnRecoverableUplinkPacketLossRate(*rplr);
405 } 410 }
406 } 411 }
407 412
408 const webrtc::AudioSendStream::Config& AudioSendStream::config() const {
409 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
410 return config_;
411 }
412
413 void AudioSendStream::SetTransportOverhead(int transport_overhead_per_packet) { 413 void AudioSendStream::SetTransportOverhead(int transport_overhead_per_packet) {
414 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 414 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
415 transport_->send_side_cc()->SetTransportOverhead( 415 transport_->send_side_cc()->SetTransportOverhead(
416 transport_overhead_per_packet); 416 transport_overhead_per_packet);
417 channel_proxy_->SetTransportOverhead(transport_overhead_per_packet); 417 channel_proxy_->SetTransportOverhead(transport_overhead_per_packet);
418 } 418 }
419 419
420 RtpState AudioSendStream::GetRtpState() const { 420 RtpState AudioSendStream::GetRtpState() const {
421 return rtp_rtcp_module_->GetRtpState(); 421 return rtp_rtcp_module_->GetRtpState();
422 } 422 }
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 if (rtp_rtcp_module_->RegisterSendPayload(codec) != 0) { 644 if (rtp_rtcp_module_->RegisterSendPayload(codec) != 0) {
645 LOG(LS_ERROR) << "RegisterCngPayloadType() failed to register CN to " 645 LOG(LS_ERROR) << "RegisterCngPayloadType() failed to register CN to "
646 "RTP/RTCP module"; 646 "RTP/RTCP module";
647 } 647 }
648 } 648 }
649 } 649 }
650 650
651 651
652 } // namespace internal 652 } // namespace internal
653 } // namespace webrtc 653 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_send_stream.h ('k') | webrtc/call/audio_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698