admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make BitrateProber::IsProbing() inline.

Browse Source 
Trivial perf optimization.

Bug: None
Change-Id: I0ceabc2a6aa0c52f4626c8792c17a60d2028712d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171694
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30901}
This commit is contained in:
Erik Språng 2020-03-26 10:37:09 +01:00 committed by Commit Bot
parent 324646626f
commit 4bdd873f6e
4 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/pacing/bitrate_prober.cc
View File

@ -74,10 +74,6 @@ void BitrateProber::SetEnabled(bool enable) {
}
}
bool BitrateProber::IsProbing() const {
return probing_state_ == ProbingState::kActive;
}
void BitrateProber::OnIncomingPacket(size_t packet_size) {
// Don't initialize probing unless we have something large enough to start
// probing.

2
modules/pacing/bitrate_prober.h
View File

@ -52,7 +52,7 @@ class BitrateProber {
// Returns true if the prober is in a probing session, i.e., it currently
// wants packets to be sent out according to the time returned by
// TimeUntilNextProbe().
bool IsProbing() const;
bool is_probing() const { return probing_state_ == ProbingState::kActive; }
// Initializes a new probing session if the prober is allowed to probe. Does
// not initialize the prober unless the packet size is large enough to probe

38
modules/pacing/bitrate_prober_unittest.cc
View File

@ -19,7 +19,7 @@ namespace webrtc {
TEST(BitrateProberTest, VerifyStatesAndTimeBetweenProbes) {
const FieldTrialBasedConfig config;
BitrateProber prober(config);
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
Timestamp now = Timestamp::Millis(0);
const Timestamp start_time = now;
@ -33,10 +33,10 @@ TEST(BitrateProberTest, VerifyStatesAndTimeBetweenProbes) {
prober.CreateProbeCluster(kTestBitrate1, now, 0);
prober.CreateProbeCluster(kTestBitrate2, now, 1);
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
prober.OnIncomingPacket(kProbeSize);
EXPECT_TRUE(prober.IsProbing());
EXPECT_TRUE(prober.is_probing());
EXPECT_EQ(0, prober.CurrentCluster().probe_cluster_id);
// First packet should probe as soon as possible.
@ -74,7 +74,7 @@ TEST(BitrateProberTest, VerifyStatesAndTimeBetweenProbes) {
EXPECT_LT(bitrate, kTestBitrate2 * 1.1);
EXPECT_EQ(prober.NextProbeTime(now), Timestamp::PlusInfinity());
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
}
TEST(BitrateProberTest, DoesntProbeWithoutRecentPackets) {
@ -85,10 +85,10 @@ TEST(BitrateProberTest, DoesntProbeWithoutRecentPackets) {
EXPECT_EQ(prober.NextProbeTime(now), Timestamp::PlusInfinity());
prober.CreateProbeCluster(DataRate::KilobitsPerSec(900), now, 0);
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
prober.OnIncomingPacket(1000);
EXPECT_TRUE(prober.IsProbing());
EXPECT_TRUE(prober.is_probing());
EXPECT_EQ(now, std::max(now, prober.NextProbeTime(now)));
prober.ProbeSent(now, 1000);
// Let time pass, no large enough packets put into prober.
@ -105,10 +105,10 @@ TEST(BitrateProberTest, DoesntInitializeProbingForSmallPackets) {
BitrateProber prober(config);
prober.SetEnabled(true);
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
prober.OnIncomingPacket(100);
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
}
TEST(BitrateProberTest, VerifyProbeSizeOnHighBitrate) {
@ -136,11 +136,11 @@ TEST(BitrateProberTest, MinumumNumberOfProbingPackets) {
prober.CreateProbeCluster(kBitrate, now, 0);
prober.OnIncomingPacket(kPacketSizeBytes);
for (int i = 0; i < 5; ++i) {
EXPECT_TRUE(prober.IsProbing());
EXPECT_TRUE(prober.is_probing());
prober.ProbeSent(now, kPacketSizeBytes);
}
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
}
TEST(BitrateProberTest, ScaleBytesUsedForProbing) {
@ -155,12 +155,12 @@ TEST(BitrateProberTest, ScaleBytesUsedForProbing) {
prober.OnIncomingPacket(kPacketSizeBytes);
int bytes_sent = 0;
while (bytes_sent < kExpectedBytesSent) {
ASSERT_TRUE(prober.IsProbing());
ASSERT_TRUE(prober.is_probing());
prober.ProbeSent(now, kPacketSizeBytes);
bytes_sent += kPacketSizeBytes;
}
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
}
TEST(BitrateProberTest, HighBitrateProbing) {
@ -175,12 +175,12 @@ TEST(BitrateProberTest, HighBitrateProbing) {
prober.OnIncomingPacket(kPacketSizeBytes);
int bytes_sent = 0;
while (bytes_sent < kExpectedBytesSent) {
ASSERT_TRUE(prober.IsProbing());
ASSERT_TRUE(prober.is_probing());
prober.ProbeSent(now, kPacketSizeBytes);
bytes_sent += kPacketSizeBytes;
}
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
}
TEST(BitrateProberTest, ProbeClusterTimeout) {
@ -195,22 +195,22 @@ TEST(BitrateProberTest, ProbeClusterTimeout) {
Timestamp now = Timestamp::Millis(0);
prober.CreateProbeCluster(kBitrate, now, /*cluster_id=*/0);
prober.OnIncomingPacket(kSmallPacketSize);
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
now += kTimeout;
prober.CreateProbeCluster(kBitrate / 10, now, /*cluster_id=*/1);
prober.OnIncomingPacket(kSmallPacketSize);
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
now += TimeDelta::Millis(1);
prober.CreateProbeCluster(kBitrate / 10, now, /*cluster_id=*/2);
prober.OnIncomingPacket(kSmallPacketSize);
EXPECT_TRUE(prober.IsProbing());
EXPECT_TRUE(prober.is_probing());
int bytes_sent = 0;
while (bytes_sent < kExpectedBytesSent) {
ASSERT_TRUE(prober.IsProbing());
ASSERT_TRUE(prober.is_probing());
prober.ProbeSent(now, kSmallPacketSize);
bytes_sent += kSmallPacketSize;
}
EXPECT_FALSE(prober.IsProbing());
EXPECT_FALSE(prober.is_probing());
}
} // namespace webrtc

4
modules/pacing/pacing_controller.cc
View File

@ -327,7 +327,7 @@ Timestamp PacingController::NextSendTime() const {
}
// If probing is active, that always takes priority.
if (prober_.IsProbing()) {
if (prober_.is_probing()) {
Timestamp probe_time = prober_.NextProbeTime(now);
// |probe_time| == PlusInfinity indicates no probe scheduled.
if (probe_time != Timestamp::PlusInfinity() && !probing_send_failure_) {
@ -462,7 +462,7 @@ void PacingController::ProcessPackets() {
}
bool first_packet_in_probe = false;
bool is_probing = prober_.IsProbing();
bool is_probing = prober_.is_probing();
PacedPacketInfo pacing_info;
absl::optional<DataSize> recommended_probe_size;
if (is_probing) {