From 661d94996b0301cee460d0e486e8371a05977aca Mon Sep 17 00:00:00 2001 From: terelius Date: Tue, 12 Sep 2017 05:47:34 -0700 Subject: [PATCH] Only use BBRs pacer if the unit test is running BBR. Otherwise use WebRTCs default pacer. BUG=None Review-Url: https://codereview.webrtc.org/3009363002 Cr-Commit-Position: refs/heads/master@{#19797} --- .../modules/remote_bitrate_estimator/test/packet_sender.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc index 33209cab26..1eed3809d7 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc +++ b/webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc @@ -159,9 +159,10 @@ PacedVideoSender::PacedVideoSender(PacketProcessorListener* listener, VideoSource* source, BandwidthEstimatorType estimator) : VideoSender(listener, source, estimator), - // Ugly hack to use BBR's pacer. - // TODO(gnish): Make pacer choice dependant on the algorithm being used. - pacer_(new BbrPacedSender(&clock_, this, nullptr)) { + pacer_( + estimator == kBbrEstimator + ? static_cast(new BbrPacedSender(&clock_, this, nullptr)) + : static_cast(new PacedSender(&clock_, this, nullptr))) { modules_.push_back(pacer_.get()); pacer_->SetEstimatedBitrate(source->bits_per_second()); }