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 425a4e9745839a8f6f03cdb570dcb5b6222380b1..99d4ee69190e1b2cc3a6c8a3e4eda8a82ceceee7 100644 |
--- a/webrtc/modules/video_coding/jitter_buffer_unittest.cc |
+++ b/webrtc/modules/video_coding/jitter_buffer_unittest.cc |
@@ -40,7 +40,7 @@ class Vp9SsMapTest : public ::testing::Test { |
Vp9SsMapTest() : packet_() {} |
virtual void SetUp() { |
- packet_.isFirstPacket = true; |
+ packet_.is_first_packet_in_frame = true; |
packet_.dataPtr = data_; |
packet_.sizeBytes = 1400; |
packet_.seqNum = 1234; |
@@ -478,7 +478,7 @@ TEST_F(TestBasicJitterBuffer, SinglePacketFrame) { |
// Always start with a complete key frame when not allowing errors. |
jitter_buffer_->SetDecodeErrorMode(kNoErrors); |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->timestamp += 123 * 90; |
@@ -497,7 +497,7 @@ TEST_F(TestBasicJitterBuffer, VerifyHistogramStats) { |
// Always start with a complete key frame when not allowing errors. |
jitter_buffer_->SetDecodeErrorMode(kNoErrors); |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->timestamp += 123 * 90; |
@@ -532,7 +532,7 @@ TEST_F(TestBasicJitterBuffer, VerifyHistogramStats) { |
TEST_F(TestBasicJitterBuffer, DualPacketFrame) { |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
bool retransmitted = false; |
@@ -543,7 +543,7 @@ TEST_F(TestBasicJitterBuffer, DualPacketFrame) { |
EXPECT_TRUE(frame_out == NULL); |
++seq_num_; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -559,7 +559,7 @@ TEST_F(TestBasicJitterBuffer, DualPacketFrame) { |
TEST_F(TestBasicJitterBuffer, 100PacketKeyFrame) { |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
bool retransmitted = false; |
@@ -575,7 +575,7 @@ TEST_F(TestBasicJitterBuffer, 100PacketKeyFrame) { |
int loop = 0; |
do { |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
@@ -586,7 +586,7 @@ TEST_F(TestBasicJitterBuffer, 100PacketKeyFrame) { |
// Insert last packet. |
++seq_num_; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -603,7 +603,7 @@ TEST_F(TestBasicJitterBuffer, 100PacketKeyFrame) { |
TEST_F(TestBasicJitterBuffer, 100PacketDeltaFrame) { |
// Always start with a complete key frame. |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
bool retransmitted = false; |
@@ -627,7 +627,7 @@ TEST_F(TestBasicJitterBuffer, 100PacketDeltaFrame) { |
// Frame should not be complete. |
EXPECT_TRUE(frame_out == NULL); |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
// Insert 98 frames. |
int loop = 0; |
do { |
@@ -642,7 +642,7 @@ TEST_F(TestBasicJitterBuffer, 100PacketDeltaFrame) { |
// Insert the last packet. |
++seq_num_; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -660,7 +660,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseOrder) { |
// Insert the "first" packet last. |
seq_num_ += 100; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -677,7 +677,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseOrder) { |
int loop = 0; |
do { |
seq_num_--; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
@@ -688,7 +688,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseOrder) { |
// Insert the last packet. |
seq_num_--; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
@@ -705,7 +705,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseOrder) { |
TEST_F(TestBasicJitterBuffer, FrameReordering2Frames2PacketsEach) { |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
bool retransmitted = false; |
@@ -717,7 +717,7 @@ TEST_F(TestBasicJitterBuffer, FrameReordering2Frames2PacketsEach) { |
EXPECT_TRUE(frame_out == NULL); |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -731,7 +731,7 @@ TEST_F(TestBasicJitterBuffer, FrameReordering2Frames2PacketsEach) { |
seq_num_ -= 3; |
timestamp_ -= 33 * 90; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -745,7 +745,7 @@ TEST_F(TestBasicJitterBuffer, FrameReordering2Frames2PacketsEach) { |
EXPECT_TRUE(frame_out == NULL); |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -765,7 +765,7 @@ TEST_F(TestBasicJitterBuffer, FrameReordering2Frames2PacketsEach) { |
TEST_F(TestBasicJitterBuffer, TestReorderingWithPadding) { |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
// Send in an initial good packet/frame (Frame A) to start things off. |
@@ -827,7 +827,7 @@ TEST_F(TestBasicJitterBuffer, TestReorderingWithPadding) { |
TEST_F(TestBasicJitterBuffer, DuplicatePackets) { |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -853,7 +853,7 @@ TEST_F(TestBasicJitterBuffer, DuplicatePackets) { |
seq_num_++; |
packet_->seqNum = seq_num_; |
packet_->markerBit = true; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
EXPECT_EQ(kCompleteSession, |
jitter_buffer_->InsertPacket(*packet_, &retransmitted)); |
@@ -870,7 +870,7 @@ TEST_F(TestBasicJitterBuffer, DuplicatePackets) { |
TEST_F(TestBasicJitterBuffer, DuplicatePreviousDeltaFramePacket) { |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -933,7 +933,7 @@ TEST_F(TestBasicJitterBuffer, TestSkipForwardVp9) { |
bool re = false; |
packet_->codec = kVideoCodecVP9; |
packet_->video_header.codec = kRtpVideoVp9; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->video_header.codecHeader.VP9.flexible_mode = false; |
packet_->video_header.codecHeader.VP9.spatial_idx = 0; |
@@ -986,7 +986,7 @@ TEST_F(TestBasicJitterBuffer, ReorderedVp9SsData_3TlLayers) { |
bool re = false; |
packet_->codec = kVideoCodecVP9; |
packet_->video_header.codec = kRtpVideoVp9; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->video_header.codecHeader.VP9.flexible_mode = false; |
packet_->video_header.codecHeader.VP9.spatial_idx = 0; |
@@ -1067,7 +1067,7 @@ TEST_F(TestBasicJitterBuffer, ReorderedVp9SsData_2Tl2SLayers) { |
packet_->video_header.codecHeader.VP9.end_of_frame = true; |
packet_->video_header.codecHeader.VP9.tl0_pic_idx = 200; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = 65486; |
packet_->timestamp = 6000; |
@@ -1078,7 +1078,7 @@ TEST_F(TestBasicJitterBuffer, ReorderedVp9SsData_2Tl2SLayers) { |
packet_->video_header.codecHeader.VP9.temporal_up_switch = true; |
EXPECT_EQ(kIncomplete, jitter_buffer_->InsertPacket(*packet_, &re)); |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = 65487; |
packet_->frameType = kVideoFrameDelta; |
@@ -1088,7 +1088,7 @@ TEST_F(TestBasicJitterBuffer, ReorderedVp9SsData_2Tl2SLayers) { |
packet_->video_header.codecHeader.VP9.temporal_up_switch = true; |
EXPECT_EQ(kCompleteSession, jitter_buffer_->InsertPacket(*packet_, &re)); |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = 65485; |
packet_->timestamp = 3000; |
@@ -1100,7 +1100,7 @@ TEST_F(TestBasicJitterBuffer, ReorderedVp9SsData_2Tl2SLayers) { |
EXPECT_EQ(kIncomplete, jitter_buffer_->InsertPacket(*packet_, &re)); |
// Insert first frame with SS data. |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = 65484; |
packet_->frameType = kVideoFrameKey; |
@@ -1133,7 +1133,7 @@ TEST_F(TestBasicJitterBuffer, ReorderedVp9SsData_2Tl2SLayers) { |
TEST_F(TestBasicJitterBuffer, H264InsertStartCode) { |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1149,7 +1149,7 @@ TEST_F(TestBasicJitterBuffer, H264InsertStartCode) { |
EXPECT_TRUE(frame_out == NULL); |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -1167,7 +1167,7 @@ TEST_F(TestBasicJitterBuffer, SpsAndPpsHandling) { |
packet_->timestamp = timestamp_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->codec = kVideoCodecH264; |
packet_->video_header.codec = kRtpVideoH264; |
@@ -1187,7 +1187,7 @@ TEST_F(TestBasicJitterBuffer, SpsAndPpsHandling) { |
++seq_num_; |
packet_->seqNum = seq_num_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->codec = kVideoCodecH264; |
packet_->video_header.codec = kRtpVideoH264; |
@@ -1206,7 +1206,7 @@ TEST_F(TestBasicJitterBuffer, SpsAndPpsHandling) { |
++seq_num_; |
packet_->seqNum = seq_num_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->codec = kVideoCodecH264; |
packet_->video_header.codec = kRtpVideoH264; |
@@ -1228,7 +1228,7 @@ TEST_F(TestBasicJitterBuffer, SpsAndPpsHandling) { |
++seq_num_; |
packet_->seqNum = seq_num_; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->codec = kVideoCodecH264; |
packet_->video_header.codec = kRtpVideoH264; |
@@ -1251,7 +1251,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsThresholdCheck) { |
// Always start with a key frame. Use 10 packets to test Decodable State |
// boundaries. |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1263,7 +1263,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsThresholdCheck) { |
EXPECT_EQ(jitter_buffer_->NextCompleteFrame(0), nullptr); |
EXPECT_FALSE(jitter_buffer_->NextMaybeIncompleteTimestamp(×tamp)); |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
for (int i = 1; i < 9; ++i) { |
packet_->seqNum++; |
EXPECT_EQ(kIncomplete, |
@@ -1286,7 +1286,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsThresholdCheck) { |
// An incomplete frame can only be decoded once a subsequent frame has begun |
// to arrive. Insert packet in distant frame for this purpose. |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum += 100; |
packet_->timestamp += 33 * 90 * 8; |
@@ -1305,7 +1305,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsThresholdCheck) { |
EXPECT_EQ(jitter_buffer_->NextCompleteFrame(0), nullptr); |
EXPECT_TRUE(jitter_buffer_->NextMaybeIncompleteTimestamp(×tamp)); |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
for (int i = 1; i < 8; ++i) { |
packet_->seqNum++; |
EXPECT_EQ(kDecodableSession, |
@@ -1336,7 +1336,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsIncompleteKey) { |
jitter_buffer_->SetDecodeErrorMode(kSelectiveErrors); |
// Always start with a key frame. |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1352,7 +1352,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsIncompleteKey) { |
// An incomplete frame can only be decoded once a subsequent frame has begun |
// to arrive. Insert packet in distant frame for this purpose. |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum += 100; |
packet_->timestamp += 33 * 90 * 8; |
@@ -1364,7 +1364,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsIncompleteKey) { |
// Insert second frame - an incomplete key frame. |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->seqNum -= 99; |
packet_->timestamp -= 33 * 90 * 7; |
@@ -1375,7 +1375,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsIncompleteKey) { |
// Insert a few more packets. Make sure we're waiting for the key frame to be |
// complete. |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
for (int i = 1; i < 5; ++i) { |
packet_->seqNum++; |
EXPECT_EQ(kIncomplete, |
@@ -1400,7 +1400,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsMissingFirstPacket) { |
jitter_buffer_->SetDecodeErrorMode(kSelectiveErrors); |
// Always start with a key frame. |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1416,7 +1416,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsMissingFirstPacket) { |
// An incomplete frame can only be decoded once a subsequent frame has begun |
// to arrive. Insert packet in distant frame for this purpose. |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum += 100; |
packet_->timestamp += 33 * 90 * 8; |
@@ -1445,7 +1445,7 @@ TEST_F(TestBasicJitterBuffer, PacketLossWithSelectiveErrorsMissingFirstPacket) { |
} |
// Add first packet. Frame should now be decodable, but incomplete. |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->seqNum -= 6; |
EXPECT_EQ(kDecodableSession, |
jitter_buffer_->InsertPacket(*packet_, &retransmitted)); |
@@ -1462,7 +1462,7 @@ TEST_F(TestBasicJitterBuffer, DiscontinuousStreamWhenDecodingWithErrors) { |
// Will use one packet per frame. |
jitter_buffer_->SetDecodeErrorMode(kWithErrors); |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1481,7 +1481,7 @@ TEST_F(TestBasicJitterBuffer, DiscontinuousStreamWhenDecodingWithErrors) { |
timestamp_ += 2 * 33 * 90; |
seq_num_ += 2; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1491,7 +1491,7 @@ TEST_F(TestBasicJitterBuffer, DiscontinuousStreamWhenDecodingWithErrors) { |
timestamp_ += 33 * 90; |
seq_num_ += 2; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1514,7 +1514,7 @@ TEST_F(TestBasicJitterBuffer, PacketLoss) { |
seq_num_ = 0xffff - 4; |
seq_num_++; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1528,7 +1528,7 @@ TEST_F(TestBasicJitterBuffer, PacketLoss) { |
seq_num_++; |
timestamp_ += 33 * 90; |
packet_->frameType = frametype; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1543,7 +1543,7 @@ TEST_F(TestBasicJitterBuffer, PacketLoss) { |
EXPECT_TRUE(frame_out == NULL); |
seq_num_ += 2; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->completeNALU = kNaluEnd; |
@@ -1553,7 +1553,7 @@ TEST_F(TestBasicJitterBuffer, PacketLoss) { |
// Insert an empty (non-media) packet. |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->completeNALU = kNaluEnd; |
@@ -1606,7 +1606,7 @@ TEST_F(TestBasicJitterBuffer, PacketLoss) { |
TEST_F(TestBasicJitterBuffer, DeltaFrame100PacketsWithSeqNumWrap) { |
seq_num_ = 0xfff0; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1622,7 +1622,7 @@ TEST_F(TestBasicJitterBuffer, DeltaFrame100PacketsWithSeqNumWrap) { |
int loop = 0; |
do { |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
@@ -1637,7 +1637,7 @@ TEST_F(TestBasicJitterBuffer, DeltaFrame100PacketsWithSeqNumWrap) { |
} while (loop < 98); |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -1656,7 +1656,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseWithNegSeqNumWrap) { |
// Insert "first" packet last seqnum. |
seq_num_ = 10; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -1672,7 +1672,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseWithNegSeqNumWrap) { |
int loop = 0; |
do { |
seq_num_--; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
@@ -1688,7 +1688,7 @@ TEST_F(TestBasicJitterBuffer, PacketReorderingReverseWithNegSeqNumWrap) { |
// Insert last packet. |
seq_num_--; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
@@ -1709,7 +1709,7 @@ TEST_F(TestBasicJitterBuffer, TestInsertOldFrame) { |
seq_num_ = 2; |
timestamp_ = 3000; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->timestamp = timestamp_; |
packet_->seqNum = seq_num_; |
@@ -1727,7 +1727,7 @@ TEST_F(TestBasicJitterBuffer, TestInsertOldFrame) { |
seq_num_--; |
timestamp_ = 2000; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1744,7 +1744,7 @@ TEST_F(TestBasicJitterBuffer, TestInsertOldFrameWithSeqNumWrap) { |
seq_num_ = 2; |
timestamp_ = 3000; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1765,7 +1765,7 @@ TEST_F(TestBasicJitterBuffer, TestInsertOldFrameWithSeqNumWrap) { |
seq_num_--; |
timestamp_ = 0xffffff00; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1782,7 +1782,7 @@ TEST_F(TestBasicJitterBuffer, TimestampWrap) { |
timestamp_ = 0xffffff00; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1795,7 +1795,7 @@ TEST_F(TestBasicJitterBuffer, TimestampWrap) { |
EXPECT_TRUE(frame_out == NULL); |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -1809,7 +1809,7 @@ TEST_F(TestBasicJitterBuffer, TimestampWrap) { |
seq_num_++; |
timestamp_ += 33 * 90; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1821,7 +1821,7 @@ TEST_F(TestBasicJitterBuffer, TimestampWrap) { |
EXPECT_TRUE(frame_out == NULL); |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -1842,7 +1842,7 @@ TEST_F(TestBasicJitterBuffer, 2FrameWithTimestampWrap) { |
timestamp_ = 0xffffff00; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->timestamp = timestamp_; |
@@ -1855,7 +1855,7 @@ TEST_F(TestBasicJitterBuffer, 2FrameWithTimestampWrap) { |
seq_num_++; |
timestamp_ = 2700; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1885,7 +1885,7 @@ TEST_F(TestBasicJitterBuffer, Insert2FramesReOrderedWithTimestampWrap) { |
seq_num_ = 2; |
timestamp_ = 2700; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1898,7 +1898,7 @@ TEST_F(TestBasicJitterBuffer, Insert2FramesReOrderedWithTimestampWrap) { |
seq_num_--; |
timestamp_ = 0xffffff00; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1926,7 +1926,7 @@ TEST_F(TestBasicJitterBuffer, DeltaFrameWithMoreThanMaxNumberOfPackets) { |
// Insert kMaxPacketsInJitterBuffer into frame. |
do { |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
@@ -1945,7 +1945,7 @@ TEST_F(TestBasicJitterBuffer, DeltaFrameWithMoreThanMaxNumberOfPackets) { |
// Max number of packets inserted. |
// Insert one more packet. |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
@@ -1976,7 +1976,7 @@ TEST_F(TestBasicJitterBuffer, ExceedNumOfFrameWithSeqNumWrap) { |
do { |
timestamp_ += 33 * 90; |
seq_num_++; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -1998,7 +1998,7 @@ TEST_F(TestBasicJitterBuffer, ExceedNumOfFrameWithSeqNumWrap) { |
// Insert one more frame. |
timestamp_ += 33 * 90; |
seq_num_++; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -2024,7 +2024,7 @@ TEST_F(TestBasicJitterBuffer, EmptyLastFrame) { |
for (int i = 0; i < maxSize + 10; i++) { |
timestamp_ += 33 * 90; |
seq_num_++; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
@@ -2049,7 +2049,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->completeNALU = kNaluStart; |
packet_->markerBit = false; |
bool retransmitted = false; |
@@ -2060,7 +2060,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
seq_num_ += 2; // Skip one packet. |
packet_->seqNum = seq_num_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->completeNALU = kNaluIncomplete; |
packet_->markerBit = false; |
@@ -2070,7 +2070,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
seq_num_++; |
packet_->seqNum = seq_num_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->completeNALU = kNaluEnd; |
packet_->markerBit = false; |
@@ -2091,7 +2091,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
packet_->seqNum = 1; |
packet_->timestamp = timestamp_ + 33 * 90 * 10; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->completeNALU = kNaluStart; |
packet_->markerBit = false; |
@@ -2114,7 +2114,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->completeNALU = kNaluEnd; |
packet_->markerBit = false; |
EXPECT_EQ(kDecodableSession, |
@@ -2124,7 +2124,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->completeNALU = kNaluStart; |
packet_->markerBit = false; |
@@ -2136,7 +2136,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->completeNALU = kNaluComplete; |
packet_->markerBit = false; |
EXPECT_EQ(kDecodableSession, |
@@ -2146,7 +2146,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->completeNALU = kNaluStart; |
packet_->markerBit = false; |
EXPECT_EQ(kDecodableSession, |
@@ -2158,7 +2158,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->completeNALU = kNaluEnd; |
packet_->markerBit = true; |
EXPECT_EQ(kDecodableSession, |
@@ -2179,7 +2179,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
emptypacket.seqNum = seq_num_; |
emptypacket.timestamp = timestamp_; |
emptypacket.frameType = kVideoFrameKey; |
- emptypacket.isFirstPacket = true; |
+ emptypacket.is_first_packet_in_frame = true; |
emptypacket.completeNALU = kNaluComplete; |
emptypacket.markerBit = true; |
EXPECT_EQ(kCompleteSession, |
@@ -2200,7 +2200,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
packet_->seqNum = seq_num_; |
packet_->timestamp = timestamp_; |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->completeNALU = kNaluComplete; |
packet_->markerBit = false; |
@@ -2211,7 +2211,7 @@ TEST_F(TestBasicJitterBuffer, H264IncompleteNalu) { |
emptypacket.seqNum = seq_num_; |
emptypacket.timestamp = timestamp_; |
emptypacket.frameType = kVideoFrameKey; |
- emptypacket.isFirstPacket = true; |
+ emptypacket.is_first_packet_in_frame = true; |
emptypacket.completeNALU = kNaluComplete; |
emptypacket.markerBit = true; |
EXPECT_EQ(kCompleteSession, |
@@ -2230,7 +2230,7 @@ TEST_F(TestBasicJitterBuffer, NextFrameWhenIncomplete) { |
jitter_buffer_->SetDecodeErrorMode(kWithErrors); |
// Start with a complete key frame - insert and decode. |
packet_->frameType = kVideoFrameKey; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
packet_->markerBit = true; |
bool retransmitted = false; |
@@ -2243,7 +2243,7 @@ TEST_F(TestBasicJitterBuffer, NextFrameWhenIncomplete) { |
packet_->seqNum += 2; |
packet_->timestamp += 33 * 90; |
packet_->frameType = kVideoFrameDelta; |
- packet_->isFirstPacket = false; |
+ packet_->is_first_packet_in_frame = false; |
packet_->markerBit = false; |
EXPECT_EQ(kDecodableSession, |
@@ -2254,7 +2254,7 @@ TEST_F(TestBasicJitterBuffer, NextFrameWhenIncomplete) { |
packet_->seqNum += 2; |
packet_->timestamp += 33 * 90; |
- packet_->isFirstPacket = true; |
+ packet_->is_first_packet_in_frame = true; |
EXPECT_EQ(kDecodableSession, |
jitter_buffer_->InsertPacket(*packet_, &retransmitted)); |