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

Added is_last_packet_in_frame to match is_first_packet_in_frame.

Browse Source 
Today we use |is_first_packet_in_frame| to know when a frame begins and the
|markerBit| to know when it ends, but the markerbit does not actually mark the
end of a frame, it marks the end of a picture.

Bug: webrtc:9361
Change-Id: Icc70e6075590cdc31e875a4eb9d489868adbb67c
Reviewed-on: https://webrtc-review.googlesource.com/100160
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24722}
This commit is contained in:
philipel
2018-09-13 11:07:48 +02:00
committed by Commit Bot
parent dc899dce9e
commit ef615ea7a3
9 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/video_coding/rtp_frame_reference_finder_unittest.cc
View File

@ -88,7 +88,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
ref_packet_buffer_->InsertPacket(&packet);
packet.seqNum = seq_num_end;
packet.markerBit = true;
packet.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet);
std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
@ -106,7 +106,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
VCMPacket packet;
packet.codec = kVideoCodecVP8;
packet.seqNum = seq_num_start;
packet.markerBit = (seq_num_start == seq_num_end);
packet.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 +118,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
if (seq_num_start != seq_num_end) {
packet.seqNum = seq_num_end;
packet.markerBit = true;
packet.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet);
}
@ -142,7 +142,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
packet.timestamp = pid;
packet.codec = kVideoCodecVP9;
packet.seqNum = seq_num_start;
packet.markerBit = (seq_num_start == seq_num_end);
packet.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);
@ -157,7 +157,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
ref_packet_buffer_->InsertPacket(&packet);
if (seq_num_start != seq_num_end) {
packet.markerBit = true;
packet.is_last_packet_in_frame = true;
vp9_header.ss_data_available = false;
packet.seqNum = seq_num_end;
ref_packet_buffer_->InsertPacket(&packet);
@ -182,7 +182,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
packet.timestamp = pid;
packet.codec = kVideoCodecVP9;
packet.seqNum = seq_num_start;
packet.markerBit = (seq_num_start == seq_num_end);
packet.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;
@ -197,7 +197,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
if (seq_num_start != seq_num_end) {
packet.seqNum = seq_num_end;
packet.markerBit = true;
packet.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet);
}