webrtc_m130/modules/congestion_controller/probe_controller_unittest.cc

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

293 lines
12 KiB
C++
Raw Normal View History

/*
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include <memory>
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
#include "modules/congestion_controller/network_control/include/network_types.h"
#include "modules/congestion_controller/probe_controller.h"
#include "rtc_base/logging.h"
#include "system_wrappers/include/clock.h"
#include "test/gmock.h"
#include "test/gtest.h"
using testing::_;
using testing::AtLeast;
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
using testing::Field;
using testing::Matcher;
using testing::NiceMock;
using testing::Return;
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
using webrtc::ProbeClusterConfig;
namespace webrtc {
namespace test {
namespace {
constexpr int kMinBitrateBps = 100;
constexpr int kStartBitrateBps = 300;
constexpr int kMaxBitrateBps = 10000;
constexpr int kExponentialProbingTimeoutMs = 5000;
constexpr int kAlrProbeInterval = 5000;
constexpr int kAlrEndedTimeoutMs = 3000;
constexpr int kBitrateDropTimeoutMs = 5000;
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
inline Matcher<ProbeClusterConfig> DataRateEqBps(int bps) {
return Field(&ProbeClusterConfig::target_data_rate, DataRate::bps(bps));
}
class MockNetworkControllerObserver : public NetworkControllerObserver {
public:
MOCK_METHOD1(OnCongestionWindow, void(CongestionWindow));
MOCK_METHOD1(OnPacerConfig, void(PacerConfig));
MOCK_METHOD1(OnProbeClusterConfig, void(ProbeClusterConfig));
MOCK_METHOD1(OnTargetTransferRate, void(TargetTransferRate));
};
} // namespace
class ProbeControllerTest : public ::testing::Test {
protected:
ProbeControllerTest() : clock_(100000000L) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_.reset(new ProbeController(&cluster_handler_));
}
~ProbeControllerTest() override {}
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
void SetNetworkAvailable(bool available) {
NetworkAvailability msg;
msg.at_time = Timestamp::ms(NowMs());
msg.network_available = available;
probe_controller_->OnNetworkAvailability(msg);
}
int64_t NowMs() { return clock_.TimeInMilliseconds(); }
SimulatedClock clock_;
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
NiceMock<MockNetworkControllerObserver> cluster_handler_;
std::unique_ptr<ProbeController> probe_controller_;
};
TEST_F(ProbeControllerTest, InitiatesProbingAtStart) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(AtLeast(2));
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
}
TEST_F(ProbeControllerTest, ProbeOnlyWhenNetworkIsUp) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
SetNetworkAvailable(false);
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(0);
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(AtLeast(2));
SetNetworkAvailable(true);
}
TEST_F(ProbeControllerTest, InitiatesProbingOnMaxBitrateIncrease) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(AtLeast(2));
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
// Long enough to time out exponential probing.
clock_.AdvanceTimeMilliseconds(kExponentialProbingTimeoutMs);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->SetEstimatedBitrate(kStartBitrateBps, NowMs());
probe_controller_->Process(NowMs());
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_,
OnProbeClusterConfig(DataRateEqBps(kMaxBitrateBps + 100)));
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps + 100, NowMs());
}
TEST_F(ProbeControllerTest, InitiatesProbingOnMaxBitrateIncreaseAtMaxBitrate) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(AtLeast(2));
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
// Long enough to time out exponential probing.
clock_.AdvanceTimeMilliseconds(kExponentialProbingTimeoutMs);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->SetEstimatedBitrate(kStartBitrateBps, NowMs());
probe_controller_->Process(NowMs());
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->SetEstimatedBitrate(kMaxBitrateBps, NowMs());
EXPECT_CALL(cluster_handler_,
OnProbeClusterConfig(DataRateEqBps(kMaxBitrateBps + 100)));
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps + 100, NowMs());
}
TEST_F(ProbeControllerTest, TestExponentialProbing) {
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
// Repeated probe should only be sent when estimated bitrate climbs above
// 0.7 * 6 * kStartBitrateBps = 1260.
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(0);
probe_controller_->SetEstimatedBitrate(1000, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(DataRateEqBps(2 * 1800)));
probe_controller_->SetEstimatedBitrate(1800, NowMs());
}
TEST_F(ProbeControllerTest, TestExponentialProbingTimeout) {
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
// Advance far enough to cause a time out in waiting for probing result.
clock_.AdvanceTimeMilliseconds(kExponentialProbingTimeoutMs);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(0);
probe_controller_->SetEstimatedBitrate(1800, NowMs());
}
TEST_F(ProbeControllerTest, RequestProbeInAlr) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(2);
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
probe_controller_->SetEstimatedBitrate(500, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(DataRateEqBps(0.85 * 500)))
.Times(1);
probe_controller_->SetAlrStartTimeMs(clock_.TimeInMilliseconds());
clock_.AdvanceTimeMilliseconds(kAlrProbeInterval + 1);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(250, NowMs());
probe_controller_->RequestProbe(NowMs());
}
TEST_F(ProbeControllerTest, RequestProbeWhenAlrEndedRecently) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(2);
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
probe_controller_->SetEstimatedBitrate(500, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(DataRateEqBps(0.85 * 500)))
.Times(1);
probe_controller_->SetAlrStartTimeMs(rtc::nullopt);
clock_.AdvanceTimeMilliseconds(kAlrProbeInterval + 1);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(250, NowMs());
probe_controller_->SetAlrEndedTimeMs(clock_.TimeInMilliseconds());
clock_.AdvanceTimeMilliseconds(kAlrEndedTimeoutMs - 1);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->RequestProbe(NowMs());
}
TEST_F(ProbeControllerTest, RequestProbeWhenAlrNotEndedRecently) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(2);
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
probe_controller_->SetEstimatedBitrate(500, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(0);
probe_controller_->SetAlrStartTimeMs(rtc::nullopt);
clock_.AdvanceTimeMilliseconds(kAlrProbeInterval + 1);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(250, NowMs());
probe_controller_->SetAlrEndedTimeMs(clock_.TimeInMilliseconds());
clock_.AdvanceTimeMilliseconds(kAlrEndedTimeoutMs + 1);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->RequestProbe(NowMs());
}
TEST_F(ProbeControllerTest, RequestProbeWhenBweDropNotRecent) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(2);
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
probe_controller_->SetEstimatedBitrate(500, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(0);
probe_controller_->SetAlrStartTimeMs(clock_.TimeInMilliseconds());
clock_.AdvanceTimeMilliseconds(kAlrProbeInterval + 1);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(250, NowMs());
clock_.AdvanceTimeMilliseconds(kBitrateDropTimeoutMs + 1);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->RequestProbe(NowMs());
}
TEST_F(ProbeControllerTest, PeriodicProbing) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(2);
probe_controller_->EnablePeriodicAlrProbing(true);
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
probe_controller_->SetEstimatedBitrate(500, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
int64_t start_time = clock_.TimeInMilliseconds();
// Expect the controller to send a new probe after 5s has passed.
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(DataRateEqBps(1000)))
.Times(1);
probe_controller_->SetAlrStartTimeMs(start_time);
clock_.AdvanceTimeMilliseconds(5000);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(500, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
// The following probe should be sent at 10s into ALR.
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(0);
probe_controller_->SetAlrStartTimeMs(start_time);
clock_.AdvanceTimeMilliseconds(4000);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(500, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(1);
probe_controller_->SetAlrStartTimeMs(start_time);
clock_.AdvanceTimeMilliseconds(1000);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
probe_controller_->SetEstimatedBitrate(500, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
}
TEST_F(ProbeControllerTest, PeriodicProbingAfterReset) {
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
NiceMock<MockNetworkControllerObserver> local_handler;
probe_controller_.reset(new ProbeController(&local_handler));
int64_t alr_start_time = clock_.TimeInMilliseconds();
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->SetAlrStartTimeMs(alr_start_time);
EXPECT_CALL(local_handler, OnProbeClusterConfig(_)).Times(2);
probe_controller_->EnablePeriodicAlrProbing(true);
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
probe_controller_->Reset(NowMs());
clock_.AdvanceTimeMilliseconds(10000);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
probe_controller_->Process(NowMs());
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(local_handler, OnProbeClusterConfig(_)).Times(2);
probe_controller_->SetBitrates(kMinBitrateBps, kStartBitrateBps,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
kMaxBitrateBps, NowMs());
// Make sure we use |kStartBitrateBps| as the estimated bitrate
// until SetEstimatedBitrate is called with an updated estimate.
clock_.AdvanceTimeMilliseconds(10000);
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(local_handler,
OnProbeClusterConfig(DataRateEqBps(kStartBitrateBps * 2)));
probe_controller_->Process(NowMs());
}
TEST_F(ProbeControllerTest, TestExponentialProbingOverflow) {
const int64_t kMbpsMultiplier = 1000000;
probe_controller_->SetBitrates(kMinBitrateBps, 10 * kMbpsMultiplier,
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
100 * kMbpsMultiplier, NowMs());
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
// Verify that probe bitrate is capped at the specified max bitrate.
EXPECT_CALL(cluster_handler_,
OnProbeClusterConfig(DataRateEqBps(100 * kMbpsMultiplier)));
probe_controller_->SetEstimatedBitrate(60 * kMbpsMultiplier, NowMs());
testing::Mock::VerifyAndClearExpectations(&cluster_handler_);
// Verify that repeated probes aren't sent.
Revert "Revert "Reland "Moved congestion controller to task queue.""" This reverts commit 4e849f6925b2ac44b0957a228d7131fc391fca54. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Reland "Moved congestion controller to task queue."" > > This reverts commit 57daeb7ac7f3d80992905b53fea500953fcfd793. > > Reason for revert: Cause increased congestion and deadlocks in downstream project > > Original change's description: > > Reland "Moved congestion controller to task queue." > > > > This is a reland of 0cbcba7ea0dced1a7f353c64d6cf91d46ccb29f9. > > > > Original change's description: > > > Moved congestion controller to task queue. > > > > > > The goal of this work is to make it easier to experiment with the > > > bandwidth estimation implementation. For this reason network control > > > functionality is moved from SendSideCongestionController(SSCC), > > > PacedSender and BitrateController to the newly created > > > GoogCcNetworkController which implements the newly created > > > NetworkControllerInterface. This allows the implementation to be > > > replaced at runtime in the future. > > > > > > This is the first part of a split of a larger CL, see: > > > https://webrtc-review.googlesource.com/c/src/+/39788/8 > > > For further explanations. > > > > > > Bug: webrtc:8415 > > > Change-Id: I770189c04cc31b313bd4e57821acff55fbcb1ad3 > > > Reviewed-on: https://webrtc-review.googlesource.com/43840 > > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Björn Terelius <terelius@webrtc.org> > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#21868} > > > > Bug: webrtc:8415 > > Change-Id: I1d1756a30deed5b421b1c91c1918a13b6bb455da > > Reviewed-on: https://webrtc-review.googlesource.com/48000 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Sebastian Jansson <srte@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21899} > > TBR=terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: webrtc:8415 > Change-Id: Ida8074dcac2cc28b3629228eb22846d8a8e81b83 > Reviewed-on: https://webrtc-review.googlesource.com/52980 > Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22017} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: I3393b74370c4f4d0955f50728005b2b925be169b No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53262 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22023}
2018-02-14 16:50:17 +00:00
EXPECT_CALL(cluster_handler_, OnProbeClusterConfig(_)).Times(0);
probe_controller_->SetEstimatedBitrate(100 * kMbpsMultiplier, NowMs());
}
} // namespace test
} // namespace webrtc