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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/video_coding/jitter_buffer_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
« webrtc/base/event.cc ('K') | « webrtc/modules/video_coding/jitter_buffer.cc ('k') | webrtc/modules/video_coding/packet.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/jitter_buffer_unittest.cc
diff --git a/webrtc/modules/video_coding/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/jitter_buffer_unittest.cc
index 99d4ee69190e1b2cc3a6c8a3e4eda8a82ceceee7..ee3027e33210fe0ac1bf234d4501e493815434b6 100644
--- a/webrtc/modules/video_coding/jitter_buffer_unittest.cc
+++ b/webrtc/modules/video_coding/jitter_buffer_unittest.cc
@@ -268,7 +268,7 @@ class TestBasicJitterBuffer : public ::testing::TestWithParam<std::string>,
uint32_t timestamp = 0;
bool found_frame = jitter_buffer_->NextMaybeIncompleteTimestamp(&timestamp);
if (!found_frame)
- return NULL;
+ return nullptr;
VCMEncodedFrame* frame = jitter_buffer_->ExtractAndSetDecode(timestamp);
return frame;
}
@@ -418,7 +418,7 @@ class TestRunningJitterBuffer : public ::testing::TestWithParam<std::string>,
VCMEncodedFrame* frame =
jitter_buffer_->ExtractAndSetDecode(found_frame->TimeStamp());
- bool ret = (frame != NULL);
+ bool ret = (frame != nullptr);
jitter_buffer_->ReleaseFrame(frame);
return ret;
}
@@ -429,7 +429,7 @@ class TestRunningJitterBuffer : public ::testing::TestWithParam<std::string>,
if (!found_frame)
return false;
VCMEncodedFrame* frame = jitter_buffer_->ExtractAndSetDecode(timestamp);
- bool ret = (frame != NULL);
+ bool ret = (frame != nullptr);
jitter_buffer_->ReleaseFrame(frame);
return ret;
}
@@ -456,22 +456,22 @@ class TestJitterBufferNack : public TestRunningJitterBuffer {
TEST_F(TestBasicJitterBuffer, StopRunning) {
jitter_buffer_->Stop();
- EXPECT_TRUE(NULL == DecodeCompleteFrame());
- EXPECT_TRUE(NULL == DecodeIncompleteFrame());
+ EXPECT_TRUE(nullptr == DecodeCompleteFrame());
+ EXPECT_TRUE(nullptr == DecodeIncompleteFrame());
jitter_buffer_->Start();
// Allow selective errors.
jitter_buffer_->SetDecodeErrorMode(kSelectiveErrors);
// No packets inserted.
- EXPECT_TRUE(NULL == DecodeCompleteFrame());
- EXPECT_TRUE(NULL == DecodeIncompleteFrame());
+ EXPECT_TRUE(nullptr == DecodeCompleteFrame());
+ EXPECT_TRUE(nullptr == DecodeIncompleteFrame());
// Allow decoding with errors.
jitter_buffer_->SetDecodeErrorMode(kWithErrors);
// No packets inserted.
- EXPECT_TRUE(NULL == DecodeCompleteFrame());
- EXPECT_TRUE(NULL == DecodeIncompleteFrame());
+ EXPECT_TRUE(nullptr == DecodeCompleteFrame());
+ EXPECT_TRUE(nullptr == DecodeIncompleteFrame());
}
TEST_F(TestBasicJitterBuffer, SinglePacketFrame) {
@@ -540,7 +540,7 @@ TEST_F(TestBasicJitterBuffer, DualPacketFrame) {
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
// Should not be complete.
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
++seq_num_;
packet_->is_first_packet_in_frame = false;
@@ -569,7 +569,7 @@ TEST_F(TestBasicJitterBuffer, 100PacketKeyFrame) {
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
// Frame should not be complete.
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
// Insert 98 frames.
int loop = 0;
@@ -610,7 +610,7 @@ TEST_F(TestBasicJitterBuffer, 100PacketDeltaFrame) {
EXPECT_EQ(kCompleteSession,
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- EXPECT_FALSE(frame_out == NULL);
+ EXPECT_FALSE(frame_out == nullptr);
jitter_buffer_->ReleaseFrame(frame_out);
++seq_num_;
@@ -625,7 +625,7 @@ TEST_F(TestBasicJitterBuffer, 100PacketDeltaFrame) {
frame_out = DecodeCompleteFrame();
// Frame should not be complete.
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
packet_->is_first_packet_in_frame = false;
// Insert 98 frames.
@@ -671,7 +671,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseOrder) {
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
// Insert 98 packets.
int loop = 0;
@@ -714,7 +714,7 @@ TEST_F(TestBasicJitterBuffer, FrameReordering2Frames2PacketsEach) {
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
seq_num_++;
packet_->is_first_packet_in_frame = false;
@@ -726,7 +726,7 @@ TEST_F(TestBasicJitterBuffer, FrameReordering2Frames2PacketsEach) {
// check that we fail to get frame since seqnum is not continuous
frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
seq_num_ -= 3;
timestamp_ -= 33 * 90;
@@ -742,7 +742,7 @@ TEST_F(TestBasicJitterBuffer, FrameReordering2Frames2PacketsEach) {
frame_out = DecodeCompleteFrame();
// It should not be complete.
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
seq_num_++;
packet_->is_first_packet_in_frame = false;
@@ -773,7 +773,7 @@ TEST_F(TestBasicJitterBuffer, TestReorderingWithPadding) {
EXPECT_EQ(kCompleteSession,
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out != NULL);
+ EXPECT_TRUE(frame_out != nullptr);
jitter_buffer_->ReleaseFrame(frame_out);
// Now send in a complete delta frame (Frame C), but with a sequence number
@@ -788,7 +788,7 @@ TEST_F(TestBasicJitterBuffer, TestReorderingWithPadding) {
EXPECT_EQ(kCompleteSession,
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
// Now send in a complete delta frame (Frame B) that is continuous from A, but
// doesn't fill the full gap to C. The rest of the gap is going to be padding.
@@ -798,12 +798,12 @@ TEST_F(TestBasicJitterBuffer, TestReorderingWithPadding) {
EXPECT_EQ(kCompleteSession,
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out != NULL);
+ EXPECT_TRUE(frame_out != nullptr);
jitter_buffer_->ReleaseFrame(frame_out);
// But Frame C isn't continuous yet.
frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
// Add in the padding. These are empty packets (data length is 0) with no
// marker bit and matching the timestamp of Frame B.
@@ -821,7 +821,7 @@ TEST_F(TestBasicJitterBuffer, TestReorderingWithPadding) {
// But now Frame C should be ready!
frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out != NULL);
+ EXPECT_TRUE(frame_out != nullptr);
jitter_buffer_->ReleaseFrame(frame_out);
}
@@ -840,7 +840,7 @@ TEST_F(TestBasicJitterBuffer, DuplicatePackets) {
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
EXPECT_EQ(1, jitter_buffer_->num_packets());
EXPECT_EQ(0, jitter_buffer_->num_duplicated_packets());
@@ -859,7 +859,7 @@ TEST_F(TestBasicJitterBuffer, DuplicatePackets) {
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
frame_out = DecodeCompleteFrame();
- ASSERT_TRUE(frame_out != NULL);
+ ASSERT_TRUE(frame_out != nullptr);
CheckOutFrame(frame_out, 2 * size_, false);
EXPECT_EQ(kVideoFrameKey, frame_out->FrameType());
@@ -884,7 +884,7 @@ TEST_F(TestBasicJitterBuffer, DuplicatePreviousDeltaFramePacket) {
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- ASSERT_TRUE(frame_out != NULL);
+ ASSERT_TRUE(frame_out != nullptr);
CheckOutFrame(frame_out, size_, false);
EXPECT_EQ(kVideoFrameKey, frame_out->FrameType());
jitter_buffer_->ReleaseFrame(frame_out);
@@ -913,7 +913,7 @@ TEST_F(TestBasicJitterBuffer, DuplicatePreviousDeltaFramePacket) {
// Should be able to decode 3 delta frames, key frame already decoded.
for (size_t i = 0; i < 3; ++i) {
frame_out = DecodeCompleteFrame();
- ASSERT_TRUE(frame_out != NULL);
+ ASSERT_TRUE(frame_out != nullptr);
CheckOutFrame(frame_out, size_, false);
EXPECT_EQ(kVideoFrameDelta, frame_out->FrameType());
jitter_buffer_->ReleaseFrame(frame_out);
@@ -1146,7 +1146,7 @@ TEST_F(TestBasicJitterBuffer, H264InsertStartCode) {
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
// Frame should not be complete.
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
seq_num_++;
packet_->is_first_packet_in_frame = false;
@@ -1321,7 +1321,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsThresholdCheck) {
EXPECT_TRUE(jitter_buffer_->NextMaybeIncompleteTimestamp(&timestamp));
frame_out = DecodeIncompleteFrame();
- ASSERT_FALSE(NULL == frame_out);
+ ASSERT_FALSE(nullptr == frame_out);
CheckOutFrame(frame_out, 9 * size_, false);
EXPECT_EQ(kVideoFrameDelta, frame_out->FrameType());
jitter_buffer_->ReleaseFrame(frame_out);
@@ -1474,7 +1474,7 @@ TEST_F(TestBasicJitterBuffer, DiscontinuousStreamWhenDecodingWithErrors) {
EXPECT_NE(frame, nullptr);
EXPECT_EQ(packet_->timestamp, frame->TimeStamp());
frame = jitter_buffer_->ExtractAndSetDecode(frame->TimeStamp());
- EXPECT_TRUE(frame != NULL);
+ EXPECT_TRUE(frame != nullptr);
jitter_buffer_->ReleaseFrame(frame);
// Drop a complete frame.
@@ -1540,7 +1540,7 @@ TEST_F(TestBasicJitterBuffer, PacketLoss) {
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
// Should not be complete.
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
seq_num_ += 2;
packet_->is_first_packet_in_frame = false;
@@ -1617,7 +1617,7 @@ TEST_F(TestBasicJitterBuffer, DeltaFrame100PacketsWithSeqNumWrap) {
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
int loop = 0;
do {
@@ -1631,7 +1631,7 @@ TEST_F(TestBasicJitterBuffer, DeltaFrame100PacketsWithSeqNumWrap) {
frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
loop++;
} while (loop < 98);
@@ -1666,7 +1666,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseWithNegSeqNumWrap) {
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
// Should not be complete.
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
// Insert 98 frames.
int loop = 0;
@@ -1681,7 +1681,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseWithNegSeqNumWrap) {
frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
loop++;
} while (loop < 98);
@@ -1792,7 +1792,7 @@ TEST_F(TestBasicJitterBuffer, TimestampWrap) {
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
seq_num_++;
packet_->is_first_packet_in_frame = false;
@@ -1818,7 +1818,7 @@ TEST_F(TestBasicJitterBuffer, TimestampWrap) {
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
seq_num_++;
packet_->is_first_packet_in_frame = false;
@@ -1951,7 +1951,7 @@ TEST_F(TestBasicJitterBuffer, DeltaFrameWithMoreThanMaxNumberOfPackets) {
// Insert the packet -> frame recycled.
EXPECT_EQ(kSizeError, jitter_buffer_->InsertPacket(*packet_, &retransmitted));
- EXPECT_TRUE(NULL == DecodeCompleteFrame());
+ EXPECT_TRUE(nullptr == DecodeCompleteFrame());
}
TEST_F(TestBasicJitterBuffer, ExceedNumOfFrameWithSeqNumWrap) {
@@ -2033,7 +2033,7 @@ TEST_F(TestBasicJitterBuffer, EmptyLastFrame) {
EXPECT_EQ(kNoError, jitter_buffer_->InsertPacket(*packet_, &retransmitted));
VCMEncodedFrame* testFrame = DecodeIncompleteFrame();
// Timestamp should never be the last TS inserted.
- if (testFrame != NULL) {
+ if (testFrame != nullptr) {
EXPECT_TRUE(testFrame->TimeStamp() < timestamp_);
jitter_buffer_->ReleaseFrame(testFrame);
}
@@ -2190,7 +2190,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) {
// Will be sent to the decoder, as a packet belonging to a subsequent frame
// has arrived.
frame_out = DecodeIncompleteFrame();
- EXPECT_TRUE(frame_out != NULL);
+ EXPECT_TRUE(frame_out != nullptr);
jitter_buffer_->ReleaseFrame(frame_out);
// Test that a frame can include an empty packet.
@@ -2237,7 +2237,7 @@ TEST_F(TestBasicJitterBuffer, NextFrameWhenIncomplete) {
EXPECT_EQ(kCompleteSession,
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
VCMEncodedFrame* frame_out = DecodeCompleteFrame();
- EXPECT_TRUE(frame_out != NULL);
+ EXPECT_TRUE(frame_out != nullptr);
jitter_buffer_->ReleaseFrame(frame_out);
packet_->seqNum += 2;
@@ -2250,7 +2250,7 @@ TEST_F(TestBasicJitterBuffer, NextFrameWhenIncomplete) {
jitter_buffer_->InsertPacket(*packet_, &retransmitted));
frame_out = DecodeIncompleteFrame();
- EXPECT_TRUE(frame_out == NULL);
+ EXPECT_TRUE(frame_out == nullptr);
packet_->seqNum += 2;
packet_->timestamp += 33 * 90;
@@ -2510,7 +2510,7 @@ TEST_F(TestJitterBufferNack, NackListBuiltBeforeFirstDecode) {
InsertFrame(kVideoFrameKey);
stream_generator_->GenerateFrame(kVideoFrameDelta, 2, 0,
clock_->TimeInMilliseconds());
- stream_generator_->NextPacket(NULL); // Drop packet.
+ stream_generator_->NextPacket(nullptr); // Drop packet.
EXPECT_EQ(kIncomplete, InsertPacketAndPop(0));
EXPECT_TRUE(DecodeCompleteFrame());
bool extended = false;
@@ -2609,7 +2609,7 @@ TEST_F(TestJitterBufferNack, NormalOperation) {
if (stream_generator_->NextSequenceNumber() % 10 != 0) {
EXPECT_EQ(kDecodableSession, InsertPacketAndPop(0));
} else {
- stream_generator_->NextPacket(NULL); // Drop packet
+ stream_generator_->NextPacket(nullptr); // Drop packet
}
}
EXPECT_EQ(kDecodableSession, InsertPacketAndPop(0));
@@ -2644,7 +2644,7 @@ TEST_F(TestJitterBufferNack, NormalOperationWrap) {
EXPECT_EQ(kIncomplete, InsertPacketAndPop(0));
EXPECT_FALSE(request_key_frame);
} else {
- stream_generator_->NextPacket(NULL); // Drop packet
+ stream_generator_->NextPacket(nullptr); // Drop packet
}
}
EXPECT_EQ(kIncomplete, InsertPacketAndPop(0));
@@ -2678,7 +2678,7 @@ TEST_F(TestJitterBufferNack, NormalOperationWrap2) {
EXPECT_EQ(kCompleteSession, InsertPacketAndPop(0));
EXPECT_FALSE(request_key_frame);
} else {
- stream_generator_->NextPacket(NULL); // Drop packet
+ stream_generator_->NextPacket(nullptr); // Drop packet
}
stream_generator_->GenerateFrame(kVideoFrameDelta, 1, 0,
clock_->TimeInMilliseconds());
« webrtc/base/event.cc ('K') | « webrtc/modules/video_coding/jitter_buffer.cc ('k') | webrtc/modules/video_coding/packet.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698