zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete redundant members from VCMPacket.

Browse Source 
The values are available as part of the RTPVideoHeader member.

Bug: None
Change-Id: I832fffc449929badec3796d7096c9cdc0d43d344
Reviewed-on: https://webrtc-review.googlesource.com/c/123234
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26773}
This commit is contained in:
Niels Möller
2019-02-20 13:12:21 +01:00
committed by Commit Bot
parent 4d2367a69e
commit d5e02f0b92
17 changed files with 220 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/video_coding/rtp_frame_reference_finder_unittest.cc
View File

@ -82,13 +82,13 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
uint16_t seq_num_end,
bool keyframe) {
VCMPacket packet;
packet.codec = kVideoCodecGeneric;
packet.video_header.codec = kVideoCodecGeneric;
packet.seqNum = seq_num_start;
packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
ref_packet_buffer_->InsertPacket(&packet);
packet.seqNum = seq_num_end;
packet.is_last_packet_in_frame = true;
packet.video_header.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet);
std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
@ -104,9 +104,10 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
int32_t tl0 = kNoTl0PicIdx,
bool sync = false) {
VCMPacket packet;
packet.codec = kVideoCodecVP8;
packet.video_header.codec = kVideoCodecVP8;
packet.seqNum = seq_num_start;
packet.is_last_packet_in_frame = (seq_num_start == seq_num_end);
packet.video_header.is_last_packet_in_frame =
(seq_num_start == seq_num_end);
packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
auto& vp8_header =
packet.video_header.video_type_header.emplace<RTPVideoHeaderVP8>();
@ -118,7 +119,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
if (seq_num_start != seq_num_end) {
packet.seqNum = seq_num_end;
packet.is_last_packet_in_frame = true;
packet.video_header.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet);
}
@ -141,9 +142,10 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
auto& vp9_header =
packet.video_header.video_type_header.emplace<RTPVideoHeaderVP9>();
packet.timestamp = pid;
packet.codec = kVideoCodecVP9;
packet.video_header.codec = kVideoCodecVP9;
packet.seqNum = seq_num_start;
packet.is_last_packet_in_frame = (seq_num_start == seq_num_end);
packet.video_header.is_last_packet_in_frame =
(seq_num_start == seq_num_end);
packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
vp9_header.flexible_mode = false;
vp9_header.picture_id = pid % (1 << 15);
@ -159,7 +161,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
ref_packet_buffer_->InsertPacket(&packet);
if (seq_num_start != seq_num_end) {
packet.is_last_packet_in_frame = true;
packet.video_header.is_last_packet_in_frame = true;
vp9_header.ss_data_available = false;
packet.seqNum = seq_num_end;
ref_packet_buffer_->InsertPacket(&packet);
@ -182,9 +184,10 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
auto& vp9_header =
packet.video_header.video_type_header.emplace<RTPVideoHeaderVP9>();
packet.timestamp = pid;
packet.codec = kVideoCodecVP9;
packet.video_header.codec = kVideoCodecVP9;
packet.seqNum = seq_num_start;
packet.is_last_packet_in_frame = (seq_num_start == seq_num_end);
packet.video_header.is_last_packet_in_frame =
(seq_num_start == seq_num_end);
packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
vp9_header.inter_layer_predicted = inter;
vp9_header.flexible_mode = true;
@ -199,7 +202,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
if (seq_num_start != seq_num_end) {
packet.seqNum = seq_num_end;
packet.is_last_packet_in_frame = true;
packet.video_header.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet);
}