mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 23:01:21 +01:00

This reverts commit65792c5a5c
. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Revert "Reland "Moved congestion controller to task queue.""" > > This reverts commit4e849f6925
. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Revert "Reland "Moved congestion controller to task queue."" > > > > This reverts commit57daeb7ac7
. > > > > 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 of0cbcba7ea0
. > > > > > > 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} TBR=danilchap@webrtc.org,terelius@webrtc.org,stefan@webrtc.org,srte@webrtc.org Change-Id: Id68ad986ee51142b7be3381d0793709b4392fe2c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8415 Reviewed-on: https://webrtc-review.googlesource.com/53360 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22024}
221 lines
7.4 KiB
C++
221 lines
7.4 KiB
C++
/*
|
|
* 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 "modules/congestion_controller/probe_bitrate_estimator.h"
|
|
|
|
#include <vector>
|
|
#include <utility>
|
|
|
|
#include "modules/remote_bitrate_estimator/aimd_rate_control.h"
|
|
#include "test/gmock.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
constexpr int kInvalidBitrate = -1;
|
|
constexpr int kDefaultMinProbes = 5;
|
|
constexpr int kDefaultMinBytes = 5000;
|
|
constexpr float kTargetUtilizationFraction = 0.95f;
|
|
} // anonymous namespace
|
|
|
|
class TestProbeBitrateEstimator : public ::testing::Test {
|
|
public:
|
|
TestProbeBitrateEstimator() : probe_bitrate_estimator_(nullptr) {}
|
|
|
|
// TODO(philipel): Use PacedPacketInfo when ProbeBitrateEstimator is rewritten
|
|
// to use that information.
|
|
void AddPacketFeedback(int probe_cluster_id,
|
|
size_t size_bytes,
|
|
int64_t send_time_ms,
|
|
int64_t arrival_time_ms,
|
|
int min_probes = kDefaultMinProbes,
|
|
int min_bytes = kDefaultMinBytes) {
|
|
PacedPacketInfo pacing_info(probe_cluster_id, min_probes, min_bytes);
|
|
PacketFeedback packet_feedback(arrival_time_ms, send_time_ms, 0, size_bytes,
|
|
pacing_info);
|
|
measured_bps_ =
|
|
probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(packet_feedback);
|
|
}
|
|
|
|
protected:
|
|
int measured_bps_ = kInvalidBitrate;
|
|
ProbeBitrateEstimator probe_bitrate_estimator_;
|
|
};
|
|
|
|
TEST_F(TestProbeBitrateEstimator, OneCluster) {
|
|
AddPacketFeedback(0, 1000, 0, 10);
|
|
AddPacketFeedback(0, 1000, 10, 20);
|
|
AddPacketFeedback(0, 1000, 20, 30);
|
|
AddPacketFeedback(0, 1000, 30, 40);
|
|
|
|
EXPECT_NEAR(measured_bps_, 800000, 10);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, OneClusterTooFewProbes) {
|
|
AddPacketFeedback(0, 2000, 0, 10);
|
|
AddPacketFeedback(0, 2000, 10, 20);
|
|
AddPacketFeedback(0, 2000, 20, 30);
|
|
|
|
EXPECT_EQ(kInvalidBitrate, measured_bps_);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, OneClusterTooFewBytes) {
|
|
const int kMinBytes = 6000;
|
|
AddPacketFeedback(0, 800, 0, 10, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 800, 10, 20, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 800, 20, 30, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 800, 30, 40, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 800, 40, 50, kDefaultMinProbes, kMinBytes);
|
|
|
|
EXPECT_EQ(kInvalidBitrate, measured_bps_);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, SmallCluster) {
|
|
const int kMinBytes = 1000;
|
|
AddPacketFeedback(0, 150, 0, 10, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 150, 10, 20, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 150, 20, 30, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 150, 30, 40, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 150, 40, 50, kDefaultMinProbes, kMinBytes);
|
|
AddPacketFeedback(0, 150, 50, 60, kDefaultMinProbes, kMinBytes);
|
|
EXPECT_NEAR(measured_bps_, 120000, 10);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, LargeCluster) {
|
|
const int kMinProbes = 30;
|
|
const int kMinBytes = 312500;
|
|
|
|
int64_t send_time = 0;
|
|
int64_t receive_time = 5;
|
|
for (int i = 0; i < 25; ++i) {
|
|
AddPacketFeedback(0, 12500, send_time, receive_time, kMinProbes, kMinBytes);
|
|
++send_time;
|
|
++receive_time;
|
|
}
|
|
EXPECT_NEAR(measured_bps_, 100000000, 10);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, FastReceive) {
|
|
AddPacketFeedback(0, 1000, 0, 15);
|
|
AddPacketFeedback(0, 1000, 10, 30);
|
|
AddPacketFeedback(0, 1000, 20, 35);
|
|
AddPacketFeedback(0, 1000, 30, 40);
|
|
|
|
EXPECT_NEAR(measured_bps_, 800000, 10);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, TooFastReceive) {
|
|
AddPacketFeedback(0, 1000, 0, 19);
|
|
AddPacketFeedback(0, 1000, 10, 22);
|
|
AddPacketFeedback(0, 1000, 20, 25);
|
|
AddPacketFeedback(0, 1000, 40, 27);
|
|
|
|
EXPECT_EQ(measured_bps_, kInvalidBitrate);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, SlowReceive) {
|
|
AddPacketFeedback(0, 1000, 0, 10);
|
|
AddPacketFeedback(0, 1000, 10, 40);
|
|
AddPacketFeedback(0, 1000, 20, 70);
|
|
AddPacketFeedback(0, 1000, 30, 85);
|
|
// Expected send rate = 800 kbps, expected receive rate = 320 kbps.
|
|
|
|
EXPECT_NEAR(measured_bps_, kTargetUtilizationFraction * 320000, 10);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, BurstReceive) {
|
|
AddPacketFeedback(0, 1000, 0, 50);
|
|
AddPacketFeedback(0, 1000, 10, 50);
|
|
AddPacketFeedback(0, 1000, 20, 50);
|
|
AddPacketFeedback(0, 1000, 40, 50);
|
|
|
|
EXPECT_EQ(measured_bps_, kInvalidBitrate);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, MultipleClusters) {
|
|
AddPacketFeedback(0, 1000, 0, 10);
|
|
AddPacketFeedback(0, 1000, 10, 20);
|
|
AddPacketFeedback(0, 1000, 20, 30);
|
|
AddPacketFeedback(0, 1000, 40, 60);
|
|
// Expected send rate = 600 kbps, expected receive rate = 480 kbps.
|
|
EXPECT_NEAR(measured_bps_, kTargetUtilizationFraction * 480000, 10);
|
|
|
|
AddPacketFeedback(0, 1000, 50, 60);
|
|
// Expected send rate = 640 kbps, expected receive rate = 640 kbps.
|
|
EXPECT_NEAR(measured_bps_, 640000, 10);
|
|
|
|
AddPacketFeedback(1, 1000, 60, 70);
|
|
AddPacketFeedback(1, 1000, 65, 77);
|
|
AddPacketFeedback(1, 1000, 70, 84);
|
|
AddPacketFeedback(1, 1000, 75, 90);
|
|
// Expected send rate = 1600 kbps, expected receive rate = 1200 kbps.
|
|
|
|
EXPECT_NEAR(measured_bps_, kTargetUtilizationFraction * 1200000, 10);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, IgnoreOldClusters) {
|
|
AddPacketFeedback(0, 1000, 0, 10);
|
|
AddPacketFeedback(0, 1000, 10, 20);
|
|
AddPacketFeedback(0, 1000, 20, 30);
|
|
|
|
AddPacketFeedback(1, 1000, 60, 70);
|
|
AddPacketFeedback(1, 1000, 65, 77);
|
|
AddPacketFeedback(1, 1000, 70, 84);
|
|
AddPacketFeedback(1, 1000, 75, 90);
|
|
// Expected send rate = 1600 kbps, expected receive rate = 1200 kbps.
|
|
|
|
EXPECT_NEAR(measured_bps_, kTargetUtilizationFraction * 1200000, 10);
|
|
|
|
// Coming in 6s later
|
|
AddPacketFeedback(0, 1000, 40 + 6000, 60 + 6000);
|
|
|
|
EXPECT_EQ(measured_bps_, kInvalidBitrate);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, IgnoreSizeLastSendPacket) {
|
|
AddPacketFeedback(0, 1000, 0, 10);
|
|
AddPacketFeedback(0, 1000, 10, 20);
|
|
AddPacketFeedback(0, 1000, 20, 30);
|
|
AddPacketFeedback(0, 1000, 30, 40);
|
|
AddPacketFeedback(0, 1500, 40, 50);
|
|
// Expected send rate = 800 kbps, expected receive rate = 900 kbps.
|
|
|
|
EXPECT_NEAR(measured_bps_, 800000, 10);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, IgnoreSizeFirstReceivePacket) {
|
|
AddPacketFeedback(0, 1500, 0, 10);
|
|
AddPacketFeedback(0, 1000, 10, 20);
|
|
AddPacketFeedback(0, 1000, 20, 30);
|
|
AddPacketFeedback(0, 1000, 30, 40);
|
|
// Expected send rate = 933 kbps, expected receive rate = 800 kbps.
|
|
|
|
EXPECT_NEAR(measured_bps_, kTargetUtilizationFraction * 800000, 10);
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, NoLastEstimatedBitrateBps) {
|
|
EXPECT_FALSE(probe_bitrate_estimator_.FetchAndResetLastEstimatedBitrateBps());
|
|
}
|
|
|
|
TEST_F(TestProbeBitrateEstimator, FetchLastEstimatedBitrateBps) {
|
|
AddPacketFeedback(0, 1000, 0, 10);
|
|
AddPacketFeedback(0, 1000, 10, 20);
|
|
AddPacketFeedback(0, 1000, 20, 30);
|
|
AddPacketFeedback(0, 1000, 30, 40);
|
|
|
|
auto estimated_bitrate_bps =
|
|
probe_bitrate_estimator_.FetchAndResetLastEstimatedBitrateBps();
|
|
EXPECT_TRUE(estimated_bitrate_bps);
|
|
EXPECT_NEAR(*estimated_bitrate_bps, 800000, 10);
|
|
EXPECT_FALSE(probe_bitrate_estimator_.FetchAndResetLastEstimatedBitrateBps());
|
|
}
|
|
|
|
} // namespace webrtc
|