Revert "Remove RTPVideoHeader::vp8() accessors."
This reverts commit af7afc66427b0e9109e7d492f2805d63d239b914.
Reason for revert: Break downstream projects.
Original change's description:
> Remove RTPVideoHeader::vp8() accessors.
>
> Bug: none
> Change-Id: Ia7d65148fb36a8f26647bee8a876ce7217ff8a68
> Reviewed-on: https://webrtc-review.googlesource.com/93321
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
> Commit-Queue: Philip Eliasson <philipel@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24626}
TBR=danilchap@webrtc.org,nisse@webrtc.org,sprang@webrtc.org,stefan@webrtc.org,philipel@webrtc.org,holmer@google.com
Change-Id: I3f7f19c0ea810c0fd988c59e6556bbea9b756b33
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: none
Reviewed-on: https://webrtc-review.googlesource.com/98864
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24628}diff --git a/modules/video_coding/decoding_state_unittest.cc b/modules/video_coding/decoding_state_unittest.cc
index 82c6f12..0049ca7 100644
--- a/modules/video_coding/decoding_state_unittest.cc
+++ b/modules/video_coding/decoding_state_unittest.cc
@@ -37,9 +37,7 @@
packet.seqNum = 0xffff;
packet.frameType = kVideoFrameDelta;
packet.video_header.codec = kVideoCodecVP8;
- auto& vp8_header =
- packet.video_header.video_type_header.emplace<RTPVideoHeaderVP8>();
- vp8_header.pictureId = 0x007F;
+ packet.video_header.vp8().pictureId = 0x007F;
FrameData frame_data;
frame_data.rtt_ms = 0;
frame_data.rolling_average_packets_per_frame = -1;
@@ -55,17 +53,17 @@
packet.frameType = kVideoFrameDelta;
// Use pictureId
packet.is_first_packet_in_frame = false;
- vp8_header.pictureId = 0x0002;
+ packet.video_header.vp8().pictureId = 0x0002;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
frame.Reset();
- vp8_header.pictureId = 0;
+ packet.video_header.vp8().pictureId = 0;
packet.seqNum = 10;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
// Use sequence numbers.
- vp8_header.pictureId = kNoPictureId;
+ packet.video_header.vp8().pictureId = kNoPictureId;
frame.Reset();
packet.seqNum = dec_state.sequence_num() - 1u;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
@@ -84,9 +82,9 @@
// Insert packet with temporal info.
dec_state.Reset();
frame.Reset();
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 0;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 0;
packet.seqNum = 1;
packet.timestamp = 1;
EXPECT_TRUE(dec_state.full_sync());
@@ -95,9 +93,9 @@
EXPECT_TRUE(dec_state.full_sync());
frame.Reset();
// 1 layer up - still good.
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 1;
- vp8_header.pictureId = 1;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 1;
+ packet.video_header.vp8().pictureId = 1;
packet.seqNum = 2;
packet.timestamp = 2;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
@@ -106,18 +104,18 @@
EXPECT_TRUE(dec_state.full_sync());
frame.Reset();
// Lost non-base layer packet => should update sync parameter.
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 3;
- vp8_header.pictureId = 3;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 3;
+ packet.video_header.vp8().pictureId = 3;
packet.seqNum = 4;
packet.timestamp = 4;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
// Now insert the next non-base layer (belonging to a next tl0PicId).
frame.Reset();
- vp8_header.tl0PicIdx = 1;
- vp8_header.temporalIdx = 2;
- vp8_header.pictureId = 4;
+ packet.video_header.vp8().tl0PicIdx = 1;
+ packet.video_header.vp8().temporalIdx = 2;
+ packet.video_header.vp8().pictureId = 4;
packet.seqNum = 5;
packet.timestamp = 5;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
@@ -127,9 +125,9 @@
EXPECT_TRUE(dec_state.full_sync());
// Next base layer (dropped interim non-base layers) - should update sync.
frame.Reset();
- vp8_header.tl0PicIdx = 1;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 5;
+ packet.video_header.vp8().tl0PicIdx = 1;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 5;
packet.seqNum = 6;
packet.timestamp = 6;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
@@ -139,18 +137,18 @@
// Check wrap for temporal layers.
frame.Reset();
- vp8_header.tl0PicIdx = 0x00FF;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 6;
+ packet.video_header.vp8().tl0PicIdx = 0x00FF;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 6;
packet.seqNum = 7;
packet.timestamp = 7;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
dec_state.SetState(&frame);
EXPECT_FALSE(dec_state.full_sync());
frame.Reset();
- vp8_header.tl0PicIdx = 0x0000;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 7;
+ packet.video_header.vp8().tl0PicIdx = 0x0000;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 7;
packet.seqNum = 8;
packet.timestamp = 8;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
@@ -216,11 +214,9 @@
packet.video_header.codec = kVideoCodecVP8;
packet.timestamp = 0;
packet.seqNum = 0;
- auto& vp8_header =
- packet.video_header.video_type_header.emplace<RTPVideoHeaderVP8>();
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 0;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 0;
FrameData frame_data;
frame_data.rtt_ms = 0;
frame_data.rolling_average_packets_per_frame = -1;
@@ -230,9 +226,9 @@
frame.Reset();
packet.timestamp = 1;
packet.seqNum = 1;
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 1;
- vp8_header.pictureId = 1;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 1;
+ packet.video_header.vp8().pictureId = 1;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
dec_state.SetState(&frame);
@@ -242,9 +238,9 @@
frame.Reset();
packet.timestamp = 3;
packet.seqNum = 3;
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 3;
- vp8_header.pictureId = 3;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 3;
+ packet.video_header.vp8().pictureId = 3;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
dec_state.SetState(&frame);
@@ -253,9 +249,9 @@
frame.Reset();
packet.timestamp = 4;
packet.seqNum = 4;
- vp8_header.tl0PicIdx = 1;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 4;
+ packet.video_header.vp8().tl0PicIdx = 1;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 4;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
dec_state.SetState(&frame);
@@ -267,9 +263,9 @@
packet.is_first_packet_in_frame = 1;
packet.timestamp = 5;
packet.seqNum = 5;
- vp8_header.tl0PicIdx = 2;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 5;
+ packet.video_header.vp8().tl0PicIdx = 2;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 5;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
dec_state.SetState(&frame);
@@ -280,9 +276,9 @@
packet.frameType = kVideoFrameDelta;
packet.timestamp = 6;
packet.seqNum = 6;
- vp8_header.tl0PicIdx = 3;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 6;
+ packet.video_header.vp8().tl0PicIdx = 3;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 6;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
EXPECT_TRUE(dec_state.full_sync());
@@ -291,9 +287,9 @@
packet.is_first_packet_in_frame = 1;
packet.timestamp = 8;
packet.seqNum = 8;
- vp8_header.tl0PicIdx = 4;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 8;
+ packet.video_header.vp8().tl0PicIdx = 4;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 8;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
EXPECT_TRUE(dec_state.full_sync());
@@ -306,10 +302,10 @@
packet.is_first_packet_in_frame = 1;
packet.timestamp = 9;
packet.seqNum = 9;
- vp8_header.tl0PicIdx = 4;
- vp8_header.temporalIdx = 2;
- vp8_header.pictureId = 9;
- vp8_header.layerSync = true;
+ packet.video_header.vp8().tl0PicIdx = 4;
+ packet.video_header.vp8().temporalIdx = 2;
+ packet.video_header.vp8().pictureId = 9;
+ packet.video_header.vp8().layerSync = true;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
dec_state.SetState(&frame);
EXPECT_TRUE(dec_state.full_sync());
@@ -327,10 +323,10 @@
packet.markerBit = 1;
packet.timestamp = 0;
packet.seqNum = 0;
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 0;
- vp8_header.layerSync = false;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 0;
+ packet.video_header.vp8().layerSync = false;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
dec_state.SetState(&frame);
EXPECT_TRUE(dec_state.full_sync());
@@ -341,10 +337,10 @@
packet.markerBit = 0;
packet.timestamp = 1;
packet.seqNum = 1;
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 2;
- vp8_header.pictureId = 1;
- vp8_header.layerSync = true;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 2;
+ packet.video_header.vp8().pictureId = 1;
+ packet.video_header.vp8().layerSync = true;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
// Layer 1
@@ -354,10 +350,10 @@
packet.markerBit = 1;
packet.timestamp = 2;
packet.seqNum = 3;
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 1;
- vp8_header.pictureId = 2;
- vp8_header.layerSync = true;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 1;
+ packet.video_header.vp8().pictureId = 2;
+ packet.video_header.vp8().layerSync = true;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
EXPECT_TRUE(dec_state.full_sync());
@@ -372,11 +368,9 @@
packet.video_header.codec = kVideoCodecVP8;
packet.timestamp = 0;
packet.seqNum = 0;
- auto& vp8_header =
- packet.video_header.video_type_header.emplace<RTPVideoHeaderVP8>();
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 0;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 0;
FrameData frame_data;
frame_data.rtt_ms = 0;
frame_data.rolling_average_packets_per_frame = -1;
@@ -390,8 +384,8 @@
packet.frameType = kVideoFrameDelta;
packet.timestamp += 3000;
++packet.seqNum;
- vp8_header.temporalIdx = 1;
- vp8_header.pictureId = 2;
+ packet.video_header.vp8().temporalIdx = 1;
+ packet.video_header.vp8().pictureId = 2;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
dec_state.SetState(&frame);
@@ -427,11 +421,9 @@
packet.video_header.codec = kVideoCodecVP8;
packet.timestamp = 0;
packet.seqNum = 0;
- auto& vp8_header =
- packet.video_header.video_type_header.emplace<RTPVideoHeaderVP8>();
- vp8_header.tl0PicIdx = 0;
- vp8_header.temporalIdx = 0;
- vp8_header.pictureId = 0;
+ packet.video_header.vp8().tl0PicIdx = 0;
+ packet.video_header.vp8().temporalIdx = 0;
+ packet.video_header.vp8().pictureId = 0;
FrameData frame_data;
frame_data.rtt_ms = 0;
frame_data.rolling_average_packets_per_frame = -1;
@@ -441,15 +433,15 @@
frame.Reset();
++packet.timestamp;
++packet.seqNum;
- vp8_header.temporalIdx++;
- vp8_header.pictureId++;
+ packet.video_header.vp8().temporalIdx++;
+ packet.video_header.vp8().pictureId++;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_TRUE(dec_state.ContinuousFrame(&frame));
frame.Reset();
// Testing only gap in tl0PicIdx when tl0PicIdx in continuous.
- vp8_header.tl0PicIdx += 3;
- vp8_header.temporalIdx++;
- vp8_header.tl0PicIdx = 1;
+ packet.video_header.vp8().tl0PicIdx += 3;
+ packet.video_header.vp8().temporalIdx++;
+ packet.video_header.vp8().tl0PicIdx = 1;
EXPECT_LE(0, frame.InsertPacket(packet, 0, kNoErrors, frame_data));
EXPECT_FALSE(dec_state.ContinuousFrame(&frame));
}