Delete deprecated constructor of SendSideCongestionController.
Move packet_router #include to where it's needed, and delete unused
MockPacketRouter.
Bug: webrtc:6847
Change-Id: I03c86c6fb8b413f5a535a237fa1724cc10960ffa
Reviewed-on: https://webrtc-review.googlesource.com/17320
Commit-Queue: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20564}diff --git a/call/BUILD.gn b/call/BUILD.gn
index cb5d341..6a4f065 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -84,6 +84,7 @@
":rtp_interfaces",
"..:webrtc_common",
"../modules/congestion_controller",
+ "../modules/pacing",
"../rtc_base:rtc_base_approved",
]
}
diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h
index 65990bb..45d6db0 100644
--- a/call/rtp_transport_controller_send.h
+++ b/call/rtp_transport_controller_send.h
@@ -14,6 +14,7 @@
#include "call/rtp_transport_controller_send_interface.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/congestion_controller/include/send_side_congestion_controller.h"
+#include "modules/pacing/packet_router.h"
#include "rtc_base/constructormagic.h"
namespace webrtc {
diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h
index ebb2e67..8e56aed 100644
--- a/modules/congestion_controller/include/send_side_congestion_controller.h
+++ b/modules/congestion_controller/include/send_side_congestion_controller.h
@@ -20,7 +20,6 @@
#include "modules/include/module.h"
#include "modules/include/module_common_types.h"
#include "modules/pacing/paced_sender.h"
-#include "modules/pacing/packet_router.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/criticalsection.h"
#include "rtc_base/networkroute.h"
@@ -58,11 +57,6 @@
protected:
virtual ~Observer() {}
};
- // TODO(holmer): Delete after fixing upstream projects.
- RTC_DEPRECATED SendSideCongestionController(const Clock* clock,
- Observer* observer,
- RtcEventLog* event_log,
- PacketRouter* packet_router);
// TODO(nisse): Consider deleting the |observer| argument to constructors
// once CongestionController is deleted.
SendSideCongestionController(const Clock* clock,
@@ -128,8 +122,7 @@
rtc::CriticalSection observer_lock_;
Observer* observer_ RTC_GUARDED_BY(observer_lock_);
RtcEventLog* const event_log_;
- std::unique_ptr<PacedSender> owned_pacer_;
- PacedSender* pacer_;
+ PacedSender* const pacer_;
const std::unique_ptr<BitrateController> bitrate_controller_;
std::unique_ptr<AcknowledgedBitrateEstimator> acknowledged_bitrate_estimator_;
const std::unique_ptr<ProbeController> probe_controller_;
diff --git a/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc
index 527dd07..8eb2140 100644
--- a/modules/congestion_controller/send_side_congestion_controller.cc
+++ b/modules/congestion_controller/send_side_congestion_controller.cc
@@ -98,47 +98,6 @@
const Clock* clock,
Observer* observer,
RtcEventLog* event_log,
- PacketRouter* packet_router)
- : clock_(clock),
- observer_(observer),
- event_log_(event_log),
- owned_pacer_(
- rtc::MakeUnique<PacedSender>(clock, packet_router, event_log)),
- pacer_(owned_pacer_.get()),
- bitrate_controller_(
- BitrateController::CreateBitrateController(clock_, event_log)),
- acknowledged_bitrate_estimator_(
- rtc::MakeUnique<AcknowledgedBitrateEstimator>()),
- probe_controller_(new ProbeController(pacer_, clock_)),
- retransmission_rate_limiter_(
- new RateLimiter(clock, kRetransmitWindowSizeMs)),
- transport_feedback_adapter_(clock_),
- last_reported_bitrate_bps_(0),
- last_reported_fraction_loss_(0),
- last_reported_rtt_(0),
- network_state_(kNetworkUp),
- pause_pacer_(false),
- pacer_paused_(false),
- min_bitrate_bps_(congestion_controller::GetMinBitrateBps()),
- delay_based_bwe_(new DelayBasedBwe(event_log_, clock_)),
- in_cwnd_experiment_(CwndExperimentEnabled()),
- accepted_queue_ms_(kDefaultAcceptedQueueMs),
- was_in_alr_(false),
- pacer_pushback_experiment_(
- webrtc::field_trial::IsEnabled(kPacerPushbackExperiment)) {
- delay_based_bwe_->SetMinBitrate(min_bitrate_bps_);
- if (in_cwnd_experiment_ &&
- !ReadCwndExperimentParameter(&accepted_queue_ms_)) {
- LOG(LS_WARNING) << "Failed to parse parameters for CwndExperiment "
- "from field trial string. Experiment disabled.";
- in_cwnd_experiment_ = false;
- }
-}
-
-SendSideCongestionController::SendSideCongestionController(
- const Clock* clock,
- Observer* observer,
- RtcEventLog* event_log,
PacedSender* pacer)
: clock_(clock),
observer_(observer),
diff --git a/modules/congestion_controller/send_side_congestion_controller_unittest.cc b/modules/congestion_controller/send_side_congestion_controller_unittest.cc
index b2f5562..d0ca6ae 100644
--- a/modules/congestion_controller/send_side_congestion_controller_unittest.cc
+++ b/modules/congestion_controller/send_side_congestion_controller_unittest.cc
@@ -14,6 +14,7 @@
#include "modules/congestion_controller/include/mock/mock_congestion_observer.h"
#include "modules/congestion_controller/include/send_side_congestion_controller.h"
#include "modules/pacing/mock/mock_paced_sender.h"
+#include "modules/pacing/packet_router.h"
#include "modules/remote_bitrate_estimator/include/bwe_defines.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
@@ -37,12 +38,6 @@
const webrtc::PacedPacketInfo kPacingInfo0(0, 5, 2000);
const webrtc::PacedPacketInfo kPacingInfo1(1, 8, 4000);
-class MockPacketRouter : public PacketRouter {
- public:
- MOCK_METHOD2(OnReceiveBitrateChanged,
- void(const std::vector<uint32_t>& ssrcs, uint32_t bitrate));
-};
-
const uint32_t kInitialBitrateBps = 60000;
} // namespace
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index ef62b1f..59ee4ea 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -223,6 +223,7 @@
# TODO(kwiberg): Remove this dependency.
"../api/audio_codecs:audio_codecs_api",
"../modules/congestion_controller",
+ "../modules/pacing",
"../modules/rtp_rtcp",
"../system_wrappers:system_wrappers_default",
"//build/config:exe_and_shlib_deps",
diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc
index efa9965..d48af60 100644
--- a/rtc_tools/event_log_visualizer/analyzer.cc
+++ b/rtc_tools/event_log_visualizer/analyzer.cc
@@ -35,6 +35,7 @@
#include "modules/congestion_controller/include/receive_side_congestion_controller.h"
#include "modules/congestion_controller/include/send_side_congestion_controller.h"
#include "modules/include/module_common_types.h"
+#include "modules/pacing/packet_router.h"
#include "modules/rtp_rtcp/include/rtp_rtcp.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"