Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1601)

Unified Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc

Issue 2924093002: Revert of Refactored incoming bitrate estimator. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
index 290f0cb125efdc49a1b9851e41047239d25fb968..338c4d8e4d38f8d95da4fddf665247a70c301c02 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
@@ -13,7 +13,6 @@
#include <algorithm>
#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
#include "webrtc/modules/congestion_controller/delay_based_bwe.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
@@ -30,8 +29,6 @@
BitrateController::CreateBitrateController(clock,
observer,
&event_log_)),
- acknowledged_bitrate_estimator_(
- rtc::MakeUnique<AcknowledgedBitrateEstimator>()),
bwe_(new DelayBasedBwe(nullptr, clock)),
feedback_observer_(bitrate_controller_->CreateRtcpBandwidthObserver()),
clock_(clock),
@@ -75,10 +72,8 @@
bwe_->OnRttUpdate(rtt_ms, rtt_ms);
BWE_TEST_LOGGING_PLOT(1, "RTT", clock_->TimeInMilliseconds(), rtt_ms);
- acknowledged_bitrate_estimator_->IncomingPacketFeedbackVector(
- packet_feedback_vector);
- DelayBasedBwe::Result result = bwe_->IncomingPacketFeedbackVector(
- packet_feedback_vector, acknowledged_bitrate_estimator_->bitrate_bps());
+ DelayBasedBwe::Result result =
+ bwe_->IncomingPacketFeedbackVector(packet_feedback_vector);
if (result.updated)
bitrate_controller_->OnDelayBasedBweResult(result);

Powered by Google App Engine
This is Rietveld 408576698