diff options
| author | Niels Möller <nisse@webrtc.org> | 2018-09-11 10:20:02 +0200 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2018-09-11 11:40:11 +0000 |
| commit | 61518281a1a04d345ac3508bf343fc2e356c9231 (patch) | |
| tree | aada5273055e8262c5879f5f9f65694e2e5eae12 /audio | |
| parent | f4ef2dd532692b45b77d22746e8ac407d1f35a46 (diff) | |
| download | webrtc-61518281a1a04d345ac3508bf343fc2e356c9231.tar.gz | |
Delete always true member voe::Channel::pacing_enabled_
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}
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/channel.cc | 15 | ||||
| -rw-r--r-- | audio/channel.h | 1 |
2 files changed, 6 insertions, 10 deletions
diff --git a/audio/channel.cc b/audio/channel.cc index d884e03173..9775243187 100644 --- a/audio/channel.cc +++ b/audio/channel.cc @@ -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); diff --git a/audio/channel.h b/audio/channel.h index 562e79ef04..b9694aa19f 100644 --- a/audio/channel.h +++ b/audio/channel.h @@ -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_; |