cc5903e15f
Currently, BitrateProber does not scale higher than 2 Mbps to 6 Mbps. The actual number is dependent on the size of the last packet. If a packet of around 250 bytes is used for probing, it fails above 2 Mbps. BitrateProber now provides a recommendation on probe size instead of a packet size. PacedSender utilizes this to decide on the number of packets per probe. This enables BitrateProber to scale up-to higher bitrates. Tests with chromoting show it stalls at about 10 Mbps (perhaps due to the limitation on the simulation pipeline to deliver packets). BUG=webrtc:6332 Review-Url: https://codereview.webrtc.org/2347023002 Cr-Commit-Position: refs/heads/master@{#14503}
106 lines
3.4 KiB
C++
106 lines
3.4 KiB
C++
/*
|
|
* Copyright (c) 2014 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 <limits>
|
|
|
|
#include "webrtc/modules/pacing/bitrate_prober.h"
|
|
#include "webrtc/test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
TEST(BitrateProberTest, VerifyStatesAndTimeBetweenProbes) {
|
|
BitrateProber prober;
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
int64_t now_ms = 0;
|
|
EXPECT_EQ(-1, prober.TimeUntilNextProbe(now_ms));
|
|
|
|
prober.CreateProbeCluster(900000, 6);
|
|
prober.CreateProbeCluster(1800000, 5);
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
|
|
prober.OnIncomingPacket(1000);
|
|
EXPECT_TRUE(prober.IsProbing());
|
|
EXPECT_EQ(0, prober.CurrentClusterId());
|
|
|
|
// First packet should probe as soon as possible.
|
|
EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
|
|
prober.ProbeSent(now_ms, 1000);
|
|
|
|
for (int i = 0; i < 5; ++i) {
|
|
EXPECT_EQ(8, prober.TimeUntilNextProbe(now_ms));
|
|
now_ms += 4;
|
|
EXPECT_EQ(4, prober.TimeUntilNextProbe(now_ms));
|
|
now_ms += 4;
|
|
EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
|
|
EXPECT_EQ(0, prober.CurrentClusterId());
|
|
prober.ProbeSent(now_ms, 1000);
|
|
}
|
|
for (int i = 0; i < 5; ++i) {
|
|
EXPECT_EQ(4, prober.TimeUntilNextProbe(now_ms));
|
|
now_ms += 4;
|
|
EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
|
|
EXPECT_EQ(1, prober.CurrentClusterId());
|
|
prober.ProbeSent(now_ms, 1000);
|
|
}
|
|
|
|
EXPECT_EQ(-1, prober.TimeUntilNextProbe(now_ms));
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
}
|
|
|
|
TEST(BitrateProberTest, DoesntProbeWithoutRecentPackets) {
|
|
BitrateProber prober;
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
int64_t now_ms = 0;
|
|
EXPECT_EQ(-1, prober.TimeUntilNextProbe(now_ms));
|
|
|
|
prober.CreateProbeCluster(900000, 6);
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
|
|
prober.OnIncomingPacket(1000);
|
|
EXPECT_TRUE(prober.IsProbing());
|
|
EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
|
|
prober.ProbeSent(now_ms, 1000);
|
|
// Let time pass, no large enough packets put into prober.
|
|
now_ms += 6000;
|
|
EXPECT_EQ(-1, prober.TimeUntilNextProbe(now_ms));
|
|
// Insert a small packet, not a candidate for probing.
|
|
prober.OnIncomingPacket(100);
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
EXPECT_EQ(-1, prober.TimeUntilNextProbe(now_ms));
|
|
// Insert a large-enough packet after downtime while probing should reset to
|
|
// perform a new probe since the requested one didn't finish.
|
|
prober.OnIncomingPacket(1000);
|
|
EXPECT_EQ(0, prober.TimeUntilNextProbe(now_ms));
|
|
prober.ProbeSent(now_ms, 1000);
|
|
// Next packet should be part of new probe and be sent with non-zero delay.
|
|
prober.OnIncomingPacket(1000);
|
|
EXPECT_GT(prober.TimeUntilNextProbe(now_ms), 0);
|
|
}
|
|
|
|
TEST(BitrateProberTest, DoesntInitializeProbingForSmallPackets) {
|
|
BitrateProber prober;
|
|
prober.SetEnabled(true);
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
|
|
prober.OnIncomingPacket(100);
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
}
|
|
|
|
TEST(BitrateProberTest, VerifyProbeSizeOnHighBitrate) {
|
|
BitrateProber prober;
|
|
constexpr unsigned kHighBitrateBps = 10000000; // 10 Mbps
|
|
|
|
prober.CreateProbeCluster(kHighBitrateBps, 6);
|
|
// Probe size should ensure a minimum of 1 ms interval.
|
|
EXPECT_GT(prober.RecommendedMinProbeSize(), kHighBitrateBps / 8000);
|
|
}
|
|
|
|
} // namespace webrtc
|