zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated constructor of SendSideCongestionController.

Browse Source 
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}
This commit is contained in:
Niels Möller
2017-10-31 10:19:10 +01:00
committed by Commit Bot
parent e3a4da9f44
commit fd6c0914c5
7 changed files with 6 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/congestion_controller/include/send_side_congestion_controller.h
View File

@ -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 @@ class SendSideCongestionController : public CallStatsObserver,
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 @@ class SendSideCongestionController : public CallStatsObserver,
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_;