| Index: webrtc/modules/video_coding/decoding_state_unittest.cc
|
| diff --git a/webrtc/modules/video_coding/decoding_state_unittest.cc b/webrtc/modules/video_coding/decoding_state_unittest.cc
|
| index c147354a6f62f7c0e846ea4891445447f9816f93..1edd1e3839ebf377f37c22b98d403dceff5556ef 100644
|
| --- a/webrtc/modules/video_coding/decoding_state_unittest.cc
|
| +++ b/webrtc/modules/video_coding/decoding_state_unittest.cc
|
| @@ -32,7 +32,7 @@ TEST(TestDecodingState, FrameContinuity) {
|
| VCMFrameBuffer frame;
|
| VCMFrameBuffer frame_key;
|
| VCMPacket packet;
|
| - packet.isFirstPacket = true;
|
| + packet.is_first_packet_in_frame = true;
|
| packet.timestamp = 1;
|
| packet.seqNum = 0xffff;
|
| packet.frameType = kVideoFrameDelta;
|
| @@ -52,7 +52,7 @@ TEST(TestDecodingState, FrameContinuity) {
|
| frame.Reset();
|
| packet.frameType = kVideoFrameDelta;
|
| // Use pictureId
|
| - packet.isFirstPacket = false;
|
| + packet.is_first_packet_in_frame = false;
|
| packet.video_header.codecHeader.VP8.pictureId = 0x0002;
|
| EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
|
| EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
|
| @@ -260,7 +260,7 @@ TEST(TestDecodingState, MultiLayerBehavior) {
|
| // A key frame is always a base layer.
|
| frame.Reset();
|
| packet.frameType = kVideoFrameKey;
|
| - packet.isFirstPacket = 1;
|
| + packet.is_first_packet_in_frame = 1;
|
| packet.timestamp = 5;
|
| packet.seqNum = 5;
|
| packet.video_header.codecHeader.VP8.tl0PicIdx = 2;
|
| @@ -284,7 +284,7 @@ TEST(TestDecodingState, MultiLayerBehavior) {
|
| EXPECT_TRUE(dec_state.full_sync());
|
| frame.Reset();
|
| packet.frameType = kVideoFrameDelta;
|
| - packet.isFirstPacket = 1;
|
| + packet.is_first_packet_in_frame = 1;
|
| packet.timestamp = 8;
|
| packet.seqNum = 8;
|
| packet.video_header.codecHeader.VP8.tl0PicIdx = 4;
|
| @@ -299,7 +299,7 @@ TEST(TestDecodingState, MultiLayerBehavior) {
|
| // Insert a non-ref frame - should update sync value.
|
| frame.Reset();
|
| packet.frameType = kVideoFrameDelta;
|
| - packet.isFirstPacket = 1;
|
| + packet.is_first_packet_in_frame = 1;
|
| packet.timestamp = 9;
|
| packet.seqNum = 9;
|
| packet.video_header.codecHeader.VP8.tl0PicIdx = 4;
|
| @@ -319,7 +319,7 @@ TEST(TestDecodingState, MultiLayerBehavior) {
|
| frame.Reset();
|
| dec_state.Reset();
|
| packet.frameType = kVideoFrameDelta;
|
| - packet.isFirstPacket = 1;
|
| + packet.is_first_packet_in_frame = 1;
|
| packet.markerBit = 1;
|
| packet.timestamp = 0;
|
| packet.seqNum = 0;
|
| @@ -333,7 +333,7 @@ TEST(TestDecodingState, MultiLayerBehavior) {
|
| // Layer 2 - 2 packets (insert one, lose one).
|
| frame.Reset();
|
| packet.frameType = kVideoFrameDelta;
|
| - packet.isFirstPacket = 1;
|
| + packet.is_first_packet_in_frame = 1;
|
| packet.markerBit = 0;
|
| packet.timestamp = 1;
|
| packet.seqNum = 1;
|
| @@ -346,7 +346,7 @@ TEST(TestDecodingState, MultiLayerBehavior) {
|
| // Layer 1
|
| frame.Reset();
|
| packet.frameType = kVideoFrameDelta;
|
| - packet.isFirstPacket = 1;
|
| + packet.is_first_packet_in_frame = 1;
|
| packet.markerBit = 1;
|
| packet.timestamp = 2;
|
| packet.seqNum = 3;
|
| @@ -450,7 +450,7 @@ TEST(TestDecodingState, FrameContinuityFlexibleModeKeyFrame) {
|
| VCMDecodingState dec_state;
|
| VCMFrameBuffer frame;
|
| VCMPacket packet;
|
| - packet.isFirstPacket = true;
|
| + packet.is_first_packet_in_frame = true;
|
| packet.timestamp = 1;
|
| packet.seqNum = 0xffff;
|
| uint8_t data[] = "I need a data pointer for this test!";
|
| @@ -493,7 +493,7 @@ TEST(TestDecodingState, FrameContinuityFlexibleModeOutOfOrderFrames) {
|
| VCMDecodingState dec_state;
|
| VCMFrameBuffer frame;
|
| VCMPacket packet;
|
| - packet.isFirstPacket = true;
|
| + packet.is_first_packet_in_frame = true;
|
| packet.timestamp = 1;
|
| packet.seqNum = 0xffff;
|
| uint8_t data[] = "I need a data pointer for this test!";
|
| @@ -548,7 +548,7 @@ TEST(TestDecodingState, FrameContinuityFlexibleModeGeneral) {
|
| VCMDecodingState dec_state;
|
| VCMFrameBuffer frame;
|
| VCMPacket packet;
|
| - packet.isFirstPacket = true;
|
| + packet.is_first_packet_in_frame = true;
|
| packet.timestamp = 1;
|
| packet.seqNum = 0xffff;
|
| uint8_t data[] = "I need a data pointer for this test!";
|
|
|