Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(560)

Unified Diff: webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
index bd41a134cafe963361ee6aad8388a128374e3d98..1bdcfdeb435b0982bd36e3be853ef47c38730853 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
@@ -149,7 +149,7 @@ TEST(BweTestFramework_StatsTest, MinMax) {
class BweTestFramework_RateCounterFilterTest : public ::testing::Test {
public:
BweTestFramework_RateCounterFilterTest()
- : filter_(NULL, 0, "", ""), now_ms_(0) {}
+ : filter_(nullptr, 0, "", ""), now_ms_(0) {}
virtual ~BweTestFramework_RateCounterFilterTest() {}
protected:
@@ -209,7 +209,7 @@ TEST_F(BweTestFramework_RateCounterFilterTest, Long) {
}
static void TestLossFilter(float loss_percent, bool zero_tolerance) {
- LossFilter filter(NULL, 0);
+ LossFilter filter(nullptr, 0);
filter.SetLoss(loss_percent);
Packets::size_type sent_packets = 0;
Packets::size_type remaining_packets = 0;
@@ -273,7 +273,7 @@ TEST(BweTestFramework_LossFilterTest, Loss100) {
class BweTestFramework_DelayFilterTest : public ::testing::Test {
public:
BweTestFramework_DelayFilterTest()
- : filter_(NULL, 0), now_ms_(0), sequence_number_(0) {}
+ : filter_(nullptr, 0), now_ms_(0), sequence_number_(0) {}
virtual ~BweTestFramework_DelayFilterTest() {
for (auto* packet : accumulated_packets_)
delete packet;
@@ -378,7 +378,7 @@ TEST_F(BweTestFramework_DelayFilterTest, Delay100) {
}
TEST_F(BweTestFramework_DelayFilterTest, JumpToZeroDelay) {
- DelayFilter delay(NULL, 0);
+ DelayFilter delay(nullptr, 0);
Packets acc;
Packets packets;
@@ -426,7 +426,7 @@ TEST_F(BweTestFramework_DelayFilterTest, IncreasingDelay) {
}
static void TestJitterFilter(int64_t max_jitter_ms) {
- JitterFilter filter(NULL, 0);
+ JitterFilter filter(nullptr, 0);
filter.SetMaxJitter(max_jitter_ms);
int64_t now_ms = 0;
@@ -514,7 +514,7 @@ static void TestReorderFilter(uint16_t reorder_percent) {
ASSERT_TRUE(IsSequenceNumberSorted(packets));
// Reorder packets, verify that send times are still in order.
- ReorderFilter filter(NULL, 0);
+ ReorderFilter filter(nullptr, 0);
filter.SetReorder(reorder_percent);
filter.RunFor(now_ms, &packets);
ASSERT_TRUE(IsTimeSorted(packets));
@@ -651,7 +651,7 @@ TEST_F(BweTestFramework_ChokeFilterTest, NoQueue) {
(kPacketSizeBytes * 8 * 1000 + kCapacityKbps / 2) / kCapacityKbps;
uint16_t sequence_number = 0;
int64_t send_time_us = 0;
- ChokeFilter filter(NULL, 0);
+ ChokeFilter filter(nullptr, 0);
filter.set_capacity_kbps(10);
Packets packets;
RTPHeader header;
@@ -678,14 +678,14 @@ TEST_F(BweTestFramework_ChokeFilterTest, Short) {
// 100ms, 100 packets, 10 kbps choke -> 1 kbit of data should have propagated.
// That is actually just a single packet, since each packet has 1000 bits of
// payload.
- ChokeFilter filter(NULL, 0);
+ ChokeFilter filter(nullptr, 0);
filter.set_capacity_kbps(10);
TestChoke(&filter, 100, 100, 1);
}
TEST_F(BweTestFramework_ChokeFilterTest, Medium) {
// 100ms, 10 packets, 10 kbps choke -> 1 packet through, or 1 kbit.
- ChokeFilter filter(NULL, 0);
+ ChokeFilter filter(nullptr, 0);
filter.set_capacity_kbps(10);
TestChoke(&filter, 100, 10, 1);
// 200ms, no new packets -> another packet through.
@@ -698,7 +698,7 @@ TEST_F(BweTestFramework_ChokeFilterTest, Medium) {
TEST_F(BweTestFramework_ChokeFilterTest, Long) {
// 100ms, 100 packets in queue, 10 kbps choke -> 1 packet through, or 1 kbit.
- ChokeFilter filter(NULL, 0);
+ ChokeFilter filter(nullptr, 0);
filter.set_capacity_kbps(10);
TestChoke(&filter, 100, 100, 1);
// 200ms, no input, another packet through.
@@ -720,7 +720,7 @@ TEST_F(BweTestFramework_ChokeFilterTest, Long) {
TEST_F(BweTestFramework_ChokeFilterTest, MaxDelay) {
// 10 kbps choke, 500 ms delay cap
- ChokeFilter filter(NULL, 0);
+ ChokeFilter filter(nullptr, 0);
filter.set_capacity_kbps(10);
filter.set_max_delay_ms(500);
// 100ms, 100 packets in queue, 10 kbps choke -> 1 packet through, or 1 kbit.
@@ -749,7 +749,7 @@ TEST_F(BweTestFramework_ChokeFilterTest, MaxDelay) {
TEST_F(BweTestFramework_ChokeFilterTest, ShortTrace) {
// According to the input file 6 packets should be transmitted within
// 100 milliseconds.
- TraceBasedDeliveryFilter filter(NULL, 0);
+ TraceBasedDeliveryFilter filter(nullptr, 0);
ASSERT_TRUE(filter.Init(test::ResourcePath("synthetic-trace", "rx")));
TestChoke(&filter, 100, 100, 6);
}
@@ -757,13 +757,13 @@ TEST_F(BweTestFramework_ChokeFilterTest, ShortTrace) {
TEST_F(BweTestFramework_ChokeFilterTest, ShortTraceTwoWraps) {
// According to the input file 19 packets should be transmitted within
// 280 milliseconds (at the wrapping point two packets are sent back to back).
- TraceBasedDeliveryFilter filter(NULL, 0);
+ TraceBasedDeliveryFilter filter(nullptr, 0);
ASSERT_TRUE(filter.Init(test::ResourcePath("synthetic-trace", "rx")));
TestChoke(&filter, 280, 100, 19);
}
TEST_F(BweTestFramework_ChokeFilterTest, ShortTraceMaxDelay) {
- TraceBasedDeliveryFilter filter(NULL, 0);
+ TraceBasedDeliveryFilter filter(nullptr, 0);
filter.set_max_delay_ms(25);
ASSERT_TRUE(filter.Init(test::ResourcePath("synthetic-trace", "rx")));
// Uses all slots up to 110 ms. Several packets are being dropped.
@@ -826,7 +826,7 @@ void TestVideoSender(VideoSender* sender,
TEST(BweTestFramework_VideoSenderTest, Fps1Kbps80_1s) {
// 1 fps, 80 kbps
VideoSource source(0, 1.0f, 80, 0x1234, 0);
- VideoSender sender(NULL, &source, kNullEstimator);
+ VideoSender sender(nullptr, &source, kNullEstimator);
EXPECT_EQ(80000u, source.bits_per_second());
// We're at 1 fps, so all packets should be generated on first call, giving 10
// packets of each 1000 bytes, total 10000 bytes.
@@ -846,7 +846,7 @@ TEST(BweTestFramework_VideoSenderTest, Fps1Kbps80_1s) {
TEST(BweTestFramework_VideoSenderTest, Fps1Kbps80_1s_Offset) {
// 1 fps, 80 kbps, offset 0.5 of a frame period, ==0.5s in this case.
VideoSource source(0, 1.0f, 80, 0x1234, 500);
- VideoSender sender(NULL, &source, kNullEstimator);
+ VideoSender sender(nullptr, &source, kNullEstimator);
EXPECT_EQ(80000u, source.bits_per_second());
// 498ms, no output.
TestVideoSender(&sender, 498, 0, 0, 0);
@@ -867,7 +867,7 @@ TEST(BweTestFramework_VideoSenderTest, Fps1Kbps80_1s_Offset) {
TEST(BweTestFramework_VideoSenderTest, Fps50Kpbs80_11s) {
// 50 fps, 80 kbps.
VideoSource source(0, 50.0f, 80, 0x1234, 0);
- VideoSender sender(NULL, &source, kNullEstimator);
+ VideoSender sender(nullptr, &source, kNullEstimator);
EXPECT_EQ(80000u, source.bits_per_second());
// 9981, should see 500 frames, 200 byte payloads, total 100000 bytes.
TestVideoSender(&sender, 9981, 500, 200, 100000);
@@ -884,7 +884,7 @@ TEST(BweTestFramework_VideoSenderTest, Fps50Kpbs80_11s) {
TEST(BweTestFramework_VideoSenderTest, Fps20Kpbs120_1s) {
// 20 fps, 120 kbps.
VideoSource source(0, 20.0f, 120, 0x1234, 0);
- VideoSender sender(NULL, &source, kNullEstimator);
+ VideoSender sender(nullptr, &source, kNullEstimator);
EXPECT_EQ(120000u, source.bits_per_second());
// 451ms, 10 frames with 750 byte payloads, total 7500 bytes.
TestVideoSender(&sender, 451, 10, 750, 7500);
@@ -901,7 +901,7 @@ TEST(BweTestFramework_VideoSenderTest, Fps20Kpbs120_1s) {
TEST(BweTestFramework_VideoSenderTest, Fps25Kbps820_20s) {
// 25 fps, 820 kbps.
VideoSource source(0, 25.0f, 820, 0x1234, 0);
- VideoSender sender(NULL, &source, kNullEstimator);
+ VideoSender sender(nullptr, &source, kNullEstimator);
EXPECT_EQ(820000u, source.bits_per_second());
// 9961ms, 250 frames. 820 kbps = 102500 bytes/s, so total should be 1025000.
// Each frame is 102500/25=4100 bytes, or 5 packets (4 @1000 bytes, 1 @100),
@@ -923,7 +923,7 @@ TEST(BweTestFramework_VideoSenderTest, Fps25Kbps820_20s) {
TEST(BweTestFramework_VideoSenderTest, TestAppendInOrder) {
// 1 fps, 80 kbps, 250ms offset.
VideoSource source1(0, 1.0f, 80, 0x1234, 250);
- VideoSender sender1(NULL, &source1, kNullEstimator);
+ VideoSender sender1(nullptr, &source1, kNullEstimator);
EXPECT_EQ(80000u, source1.bits_per_second());
Packets packets;
// Generate some packets, verify they are sorted.
@@ -939,7 +939,7 @@ TEST(BweTestFramework_VideoSenderTest, TestAppendInOrder) {
// Another sender, 2 fps, 160 kbps, 150ms offset
VideoSource source2(0, 2.0f, 160, 0x2234, 150);
- VideoSender sender2(NULL, &source2, kNullEstimator);
+ VideoSender sender2(nullptr, &source2, kNullEstimator);
EXPECT_EQ(160000u, source2.bits_per_second());
// Generate some packets, verify that they are merged with the packets already
// on the list.
@@ -957,7 +957,7 @@ TEST(BweTestFramework_VideoSenderTest, TestAppendInOrder) {
TEST(BweTestFramework_VideoSenderTest, FeedbackIneffective) {
VideoSource source(0, 25.0f, 820, 0x1234, 0);
- VideoSender sender(NULL, &source, kNullEstimator);
+ VideoSender sender(nullptr, &source, kNullEstimator);
EXPECT_EQ(820000u, source.bits_per_second());
TestVideoSender(&sender, 9961, 1000, 500, 1025000);

Powered by Google App Engine
This is Rietveld 408576698