ebfbc8ebfd
Reason for revert:
Speculative revert.
Linux memcheck bot started failing a lot at the time of this cl. Doesn't look related at first glance, but we don't have another lead yet.
Original issue's description:
> Fix BitrateProber to match the requested bitrate more precisely
>
> Previously BirateProber was calculating delay between probes based on
> the size of the previous probe. Because of that the actual sent bitrate
> can deviate greatly from the target value. With this change it uses
> total number of bytes in the cluster to estimate delay before each
> probe.
>
> BUG=webrtc:6952
>
> Review-Url: https://codereview.webrtc.org/2613543003
> Cr-Commit-Position: refs/heads/master@{#15971}
> Committed: 599c5011e7
TBR=philipel@webrtc.org,stefan@webrtc.org,sergeyu@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6952
Review-Url: https://codereview.webrtc.org/2626473004
Cr-Commit-Position: refs/heads/master@{#15979}
141 lines
4.4 KiB
C++
141 lines
4.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);
|
|
prober.CreateProbeCluster(1800000);
|
|
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 < 4; ++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);
|
|
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);
|
|
// Probe size should ensure a minimum of 1 ms interval.
|
|
EXPECT_GT(prober.RecommendedMinProbeSize(), kHighBitrateBps / 8000);
|
|
}
|
|
|
|
TEST(BitrateProberTest, MinumumNumberOfProbingPackets) {
|
|
BitrateProber prober;
|
|
// Even when probing at a low bitrate we expect a minimum number
|
|
// of packets to be sent.
|
|
constexpr int kBitrateBps = 100000; // 100 kbps
|
|
constexpr int kPacketSizeBytes = 1000;
|
|
|
|
prober.CreateProbeCluster(kBitrateBps);
|
|
prober.OnIncomingPacket(kPacketSizeBytes);
|
|
for (int i = 0; i < 5; ++i) {
|
|
EXPECT_TRUE(prober.IsProbing());
|
|
prober.ProbeSent(0, kPacketSizeBytes);
|
|
}
|
|
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
}
|
|
|
|
TEST(BitrateProberTest, ScaleBytesUsedForProbing) {
|
|
BitrateProber prober;
|
|
constexpr int kBitrateBps = 10000000; // 10 Mbps
|
|
constexpr int kPacketSizeBytes = 1000;
|
|
constexpr int kExpectedBytesSent = kBitrateBps * 15 / 8000;
|
|
|
|
prober.CreateProbeCluster(kBitrateBps);
|
|
prober.OnIncomingPacket(kPacketSizeBytes);
|
|
int bytes_sent = 0;
|
|
while (bytes_sent < kExpectedBytesSent) {
|
|
EXPECT_TRUE(prober.IsProbing());
|
|
prober.ProbeSent(0, kPacketSizeBytes);
|
|
bytes_sent += kPacketSizeBytes;
|
|
}
|
|
|
|
EXPECT_FALSE(prober.IsProbing());
|
|
}
|
|
|
|
} // namespace webrtc
|