From d36a815d68d3fca82bc3960b586a8495c0b6c4ea Mon Sep 17 00:00:00 2001 From: "Piotr (Peter) Slatala" Date: Fri, 15 Feb 2019 15:27:08 -0800 Subject: [PATCH] Remove the deprecated CreateProbeClusters method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: Ifad8103d5a7c4e99ef7a29e2cec02885854d141c Reviewed-on: https://webrtc-review.googlesource.com/c/123262 Reviewed-by: Björn Terelius Reviewed-by: Sebastian Jansson Commit-Queue: Peter Slatala Cr-Commit-Position: refs/heads/master@{#26778} --- modules/pacing/paced_sender.cc | 5 ----- modules/pacing/paced_sender.h | 4 ---- 2 files changed, 9 deletions(-) diff --git a/modules/pacing/paced_sender.cc b/modules/pacing/paced_sender.cc index 892b109c92..44bb774002 100644 --- a/modules/pacing/paced_sender.cc +++ b/modules/pacing/paced_sender.cc @@ -82,11 +82,6 @@ PacedSender::PacedSender(Clock* clock, PacedSender::~PacedSender() {} -void PacedSender::CreateProbeCluster(int bitrate_bps) { - CreateProbeCluster(bitrate_bps, next_probe_cluster_id_); - next_probe_cluster_id_++; -} - void PacedSender::CreateProbeCluster(int bitrate_bps, int cluster_id) { rtc::CritScope cs(&critsect_); prober_.CreateProbeCluster(bitrate_bps, TimeMilliseconds(), cluster_id); diff --git a/modules/pacing/paced_sender.h b/modules/pacing/paced_sender.h index 18add4af32..438748f806 100644 --- a/modules/pacing/paced_sender.h +++ b/modules/pacing/paced_sender.h @@ -75,7 +75,6 @@ class PacedSender : public Pacer { ~PacedSender() override; - RTC_DEPRECATED virtual void CreateProbeCluster(int bitrate_bps); virtual void CreateProbeCluster(int bitrate_bps, int cluster_id); // Temporarily pause all sending. @@ -208,9 +207,6 @@ class PacedSender : public Pacer { RoundRobinPacketQueue packets_ RTC_GUARDED_BY(critsect_); uint64_t packet_counter_ RTC_GUARDED_BY(critsect_); - // TODO(psla): Used by the RTC_DEPRECATED method, to be removed. - int next_probe_cluster_id_ = 1; - int64_t congestion_window_bytes_ RTC_GUARDED_BY(critsect_) = kNoCongestionWindow; int64_t outstanding_bytes_ RTC_GUARDED_BY(critsect_) = 0;