Reland of Rename RTPVideoHeader.isFirstPacket to .is_first_packet_in_frame.
Add RTC_DEPRACATed anonymous unions to not break downstream projects.
Orignal issue's description:
> commit 0ad21111fcc57a7e978edba3c4263f0062d7f9ff
> Author: danilchap <danilchap@webrtc.org>
> Date: Mon Dec 19 09:36:33 2016 -0800
>
> Revert of Rename RTPVideoHeader.isFirstPacket to
> .is_first_packet_in_frame. (patchset #1 id:1 of
> https://codereview.webrtc.org/2574943003/ )
>
> Reason for revert:
> breaks downstream project.
>
> Can you make this change in a compatible way using anonymous
> union:
> union {
> bool is_first_packet_in_frame;
> RTC_DEPRECATED bool isFirstPacket;
> };
> (unfortunetly this this treak breaks braced initialization in
> rtp_rtcp_impl_unittest.cc,
> so that should be rewritting in a more classic way)
>
> Original issue's description:
> > Rename RTPVideoHeader.isFirstPacket to
> > .is_first_packet_in_frame.
> >
> > Name should represent the actual meaning.
> >
> > BUG=None
> >
> > Review-Url: https://codereview.webrtc.org/2574943003
> > Cr-Commit-Position: refs/heads/master@{#15684}
> > Committed:
> > https://chromium.googlesource.com/external/webrtc/+/efde90838055f44ca05863ba020ca02c88b6d14c
>
> TBR=stefan@webrtc.org,sprang@webrtc.org,johan@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days
> ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=None
>
> Review-Url: https://codereview.webrtc.org/2589783003
> Cr-Commit-Position: refs/heads/master@{#15686}
>
BUG=None
Review-Url: https://codereview.webrtc.org/2614503002
Cr-Commit-Position: refs/heads/master@{#15987}
diff --git a/webrtc/modules/video_coding/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/jitter_buffer_unittest.cc
index 425a4e9..99d4ee6 100644
--- a/webrtc/modules/video_coding/jitter_buffer_unittest.cc
+++ b/webrtc/modules/video_coding/jitter_buffer_unittest.cc
@@ -40,7 +40,7 @@
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 @@
// 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 @@
// 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, DualPacketFrame) {
packet_->frameType = kVideoFrameKey;
- packet_->isFirstPacket = true;
+ packet_->is_first_packet_in_frame = true;
packet_->markerBit = false;
bool retransmitted = false;
@@ -543,7 +543,7 @@
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, 100PacketKeyFrame) {
packet_->frameType = kVideoFrameKey;
- packet_->isFirstPacket = true;
+ packet_->is_first_packet_in_frame = true;
packet_->markerBit = false;
bool retransmitted = false;
@@ -575,7 +575,7 @@
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 @@
// 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, 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 @@
// 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 @@
// 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 @@
// 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 @@
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 @@
// 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, FrameReordering2Frames2PacketsEach) {
packet_->frameType = kVideoFrameDelta;
- packet_->isFirstPacket = true;
+ packet_->is_first_packet_in_frame = true;
packet_->markerBit = false;
bool retransmitted = false;
@@ -717,7 +717,7 @@
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 @@
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 @@
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, 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, 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 @@
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, 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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, 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 @@
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 @@
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 @@
++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 @@
++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 @@
++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 @@
// 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 @@
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 @@
// 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 @@
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 @@
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 @@
// 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 @@
// 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 @@
// 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 @@
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 @@
// 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 @@
}
// 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 @@
// 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
// 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, 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 @@
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 @@
} 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 @@
// 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 @@
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 @@
// 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
// 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 @@
// 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 @@
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 @@
// 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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));