From e34d62caecb44bed9207e5563b9aef0de2c150f9 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Mon, 22 Jul 2019 12:55:41 +0000 Subject: [PATCH] Revert "Makes send side network estimation opt-in." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c36c8e114df8f21ec286adf1ffe76cf5fc495f53. Reason for revert: Breaks downstream code. Original change's description: > Makes send side network estimation opt-in. > > Bug: webrtc:10742 > Change-Id: I57159a3bf853ef8de32f5ba70ad4fa897ee5c528 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144046 > Reviewed-by: Björn Terelius > Commit-Queue: Sebastian Jansson > Cr-Commit-Position: refs/heads/master@{#28631} TBR=terelius@webrtc.org,srte@webrtc.org Change-Id: Ie9ce099d9154551fd123dbc1eca96ca2730fbc9f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10742 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146544 Reviewed-by: Sebastian Jansson Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#28634} --- api/transport/goog_cc_factory.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/api/transport/goog_cc_factory.cc b/api/transport/goog_cc_factory.cc index 08e4badf29..2187da36c2 100644 --- a/api/transport/goog_cc_factory.cc +++ b/api/transport/goog_cc_factory.cc @@ -38,12 +38,9 @@ GoogCcNetworkControllerFactory::Create(NetworkControllerConfig config) { goog_cc_config.feedback_only = factory_config_.feedback_only; if (factory_config_.network_state_estimator_factory) { RTC_DCHECK(config.key_value_config); - if (config.key_value_config->Lookup("WebRTC-SendSideEstimation") - .find("Enabled") == 0) { - goog_cc_config.network_state_estimator = - factory_config_.network_state_estimator_factory->Create( - config.key_value_config); - } + goog_cc_config.network_state_estimator = + factory_config_.network_state_estimator_factory->Create( + config.key_value_config); } if (factory_config_.network_state_predictor_factory) { goog_cc_config.network_state_predictor =