admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete always true member voe::Channel::pacing_enabled_

Browse Source 
Bug: None
Change-Id: If13ea3d2afa6eb149e83cdd179f6bbc7cfabcee9
Reviewed-on: https://webrtc-review.googlesource.com/99500
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24680}
This commit is contained in:
Niels Möller 2018-09-11 10:20:02 +02:00 committed by Commit Bot
parent f4ef2dd532
commit 61518281a1
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
audio/channel.cc
View File

@ -544,12 +544,12 @@ Channel::Channel(ProcessThread* module_process_thread,
configuration.overhead_observer = this;
configuration.receive_statistics = rtp_receive_statistics_.get();
configuration.bandwidth_callback = rtcp_observer_.get();
if (pacing_enabled_) {
configuration.paced_sender = rtp_packet_sender_proxy_.get();
configuration.transport_sequence_number_allocator =
seq_num_allocator_proxy_.get();
configuration.transport_feedback_callback = feedback_observer_proxy_.get();
}
configuration.paced_sender = rtp_packet_sender_proxy_.get();
configuration.transport_sequence_number_allocator =
seq_num_allocator_proxy_.get();
configuration.transport_feedback_callback = feedback_observer_proxy_.get();
configuration.event_log = event_log_;
configuration.rtt_stats = rtcp_rtt_stats;
configuration.retransmission_rate_limiter =
@ -1187,9 +1187,6 @@ int Channel::GetRTPStatistics(CallStatistics& stats) {
void Channel::SetNACKStatus(bool enable, int maxNumberOfPackets) {
// None of these functions can fail.
// If pacing is enabled we always store packets.
if (!pacing_enabled_)
_rtpRtcpModule->SetStorePacketsStatus(enable, maxNumberOfPackets);
rtp_receive_statistics_->SetMaxReorderingThreshold(maxNumberOfPackets);
if (enable)
audio_coding_->EnableNack(maxNumberOfPackets);

1
audio/channel.h
View File

@ -401,7 +401,6 @@ class Channel
rtc::CriticalSection assoc_send_channel_lock_;
Channel* associated_send_channel_ RTC_GUARDED_BY(assoc_send_channel_lock_);
bool pacing_enabled_ = true;
PacketRouter* packet_router_ = nullptr;
std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;