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

1
modules/rtp_rtcp/source/rtp_video_header.h
View File

@ -52,6 +52,7 @@ struct RTPVideoHeader {
VideoRotation rotation = VideoRotation::kVideoRotation_0; VideoRotation rotation = VideoRotation::kVideoRotation_0;
VideoContentType content_type = VideoContentType::UNSPECIFIED; VideoContentType content_type = VideoContentType::UNSPECIFIED;
bool is_first_packet_in_frame = false; bool is_first_packet_in_frame = false;
bool is_last_packet_in_frame = false;
uint8_t simulcastIdx = 0; uint8_t simulcastIdx = 0;
VideoCodecType codec = VideoCodecType::kVideoCodecGeneric; VideoCodecType codec = VideoCodecType::kVideoCodecGeneric;

2
modules/video_coding/frame_object.cc
View File

@ -72,7 +72,7 @@ RtpFrameObject::RtpFrameObject(PacketBuffer* packet_buffer,
VCMPacket* last_packet = packet_buffer_->GetPacket(last_seq_num); VCMPacket* last_packet = packet_buffer_->GetPacket(last_seq_num);
RTC_CHECK(last_packet); RTC_CHECK(last_packet);
RTC_CHECK(last_packet->markerBit); RTC_CHECK(last_packet->is_last_packet_in_frame);
// http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/ // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
// ts_126114v120700p.pdf Section 7.4.5. // ts_126114v120700p.pdf Section 7.4.5.
// The MTSI client shall add the payload bytes as defined in this clause // The MTSI client shall add the payload bytes as defined in this clause

2
modules/video_coding/packet.cc
View File

@ -28,6 +28,7 @@ VCMPacket::VCMPacket()
frameType(kEmptyFrame), frameType(kEmptyFrame),
codec(kVideoCodecGeneric), codec(kVideoCodecGeneric),
is_first_packet_in_frame(false), is_first_packet_in_frame(false),
is_last_packet_in_frame(false),
completeNALU(kNaluUnset), completeNALU(kNaluUnset),
insertStartCode(false), insertStartCode(false),
width(0), width(0),
@ -52,6 +53,7 @@ VCMPacket::VCMPacket(const uint8_t* ptr,
codec(rtpHeader.video_header().codec), codec(rtpHeader.video_header().codec),
is_first_packet_in_frame( is_first_packet_in_frame(
rtpHeader.video_header().is_first_packet_in_frame), rtpHeader.video_header().is_first_packet_in_frame),
is_last_packet_in_frame(rtpHeader.video_header().is_last_packet_in_frame),
completeNALU(kNaluIncomplete), completeNALU(kNaluIncomplete),
insertStartCode(rtpHeader.video_header().codec == kVideoCodecH264 && insertStartCode(rtpHeader.video_header().codec == kVideoCodecH264 &&
rtpHeader.video_header().is_first_packet_in_frame), rtpHeader.video_header().is_first_packet_in_frame),

1
modules/video_coding/packet.h
View File

@ -36,6 +36,7 @@ class VCMPacket {
VideoCodecType codec; VideoCodecType codec;
bool is_first_packet_in_frame; bool is_first_packet_in_frame;
bool is_last_packet_in_frame;
VCMNaluCompleteness completeNALU; // Default is kNaluIncomplete. VCMNaluCompleteness completeNALU; // Default is kNaluIncomplete.
bool insertStartCode; // True if a start code should be inserted before this bool insertStartCode; // True if a start code should be inserted before this
// packet. // packet.

2
modules/video_coding/packet_buffer.cc
View File

@ -107,7 +107,7 @@ bool PacketBuffer::InsertPacket(VCMPacket* packet) {
} }
sequence_buffer_[index].frame_begin = packet->is_first_packet_in_frame; sequence_buffer_[index].frame_begin = packet->is_first_packet_in_frame;
sequence_buffer_[index].frame_end = packet->markerBit; sequence_buffer_[index].frame_end = packet->is_last_packet_in_frame;
sequence_buffer_[index].seq_num = packet->seqNum; sequence_buffer_[index].seq_num = packet->seqNum;
sequence_buffer_[index].continuous = false; sequence_buffer_[index].continuous = false;
sequence_buffer_[index].frame_created = false; sequence_buffer_[index].frame_created = false;

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); ref_packet_buffer_->InsertPacket(&packet);
packet.seqNum = seq_num_end; packet.seqNum = seq_num_end;
packet.markerBit = true; packet.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet); ref_packet_buffer_->InsertPacket(&packet);
std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject( std::unique_ptr<RtpFrameObject> frame(new RtpFrameObject(
@ -106,7 +106,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
VCMPacket packet; VCMPacket packet;
packet.codec = kVideoCodecVP8; packet.codec = kVideoCodecVP8;
packet.seqNum = seq_num_start; 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; packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
auto& vp8_header = auto& vp8_header =
packet.video_header.video_type_header.emplace<RTPVideoHeaderVP8>(); packet.video_header.video_type_header.emplace<RTPVideoHeaderVP8>();
@ -118,7 +118,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
if (seq_num_start != seq_num_end) { if (seq_num_start != seq_num_end) {
packet.seqNum = seq_num_end; packet.seqNum = seq_num_end;
packet.markerBit = true; packet.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet); ref_packet_buffer_->InsertPacket(&packet);
} }
@ -142,7 +142,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
packet.timestamp = pid; packet.timestamp = pid;
packet.codec = kVideoCodecVP9; packet.codec = kVideoCodecVP9;
packet.seqNum = seq_num_start; 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; packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
vp9_header.flexible_mode = false; vp9_header.flexible_mode = false;
vp9_header.picture_id = pid % (1 << 15); vp9_header.picture_id = pid % (1 << 15);
@ -157,7 +157,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
ref_packet_buffer_->InsertPacket(&packet); ref_packet_buffer_->InsertPacket(&packet);
if (seq_num_start != seq_num_end) { if (seq_num_start != seq_num_end) {
packet.markerBit = true; packet.is_last_packet_in_frame = true;
vp9_header.ss_data_available = false; vp9_header.ss_data_available = false;
packet.seqNum = seq_num_end; packet.seqNum = seq_num_end;
ref_packet_buffer_->InsertPacket(&packet); ref_packet_buffer_->InsertPacket(&packet);
@ -182,7 +182,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
packet.timestamp = pid; packet.timestamp = pid;
packet.codec = kVideoCodecVP9; packet.codec = kVideoCodecVP9;
packet.seqNum = seq_num_start; 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; packet.frameType = keyframe ? kVideoFrameKey : kVideoFrameDelta;
vp9_header.inter_layer_predicted = inter; vp9_header.inter_layer_predicted = inter;
vp9_header.flexible_mode = true; vp9_header.flexible_mode = true;
@ -197,7 +197,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
if (seq_num_start != seq_num_end) { if (seq_num_start != seq_num_end) {
packet.seqNum = seq_num_end; packet.seqNum = seq_num_end;
packet.markerBit = true; packet.is_last_packet_in_frame = true;
ref_packet_buffer_->InsertPacket(&packet); ref_packet_buffer_->InsertPacket(&packet);
} }

16
modules/video_coding/video_packet_buffer_unittest.cc
View File

@ -68,7 +68,7 @@ class TestPacketBuffer : public ::testing::Test,
packet.frameType = packet.frameType =
keyframe == kKeyFrame ? kVideoFrameKey : kVideoFrameDelta; keyframe == kKeyFrame ? kVideoFrameKey : kVideoFrameDelta;
packet.is_first_packet_in_frame = first == kFirst; packet.is_first_packet_in_frame = first == kFirst;
packet.markerBit = last == kLast; packet.is_last_packet_in_frame = last == kLast;
packet.sizeBytes = data_size; packet.sizeBytes = data_size;
packet.dataPtr = data; packet.dataPtr = data;
@ -157,7 +157,7 @@ TEST_F(TestPacketBuffer, NackCount) {
packet.seqNum = seq_num; packet.seqNum = seq_num;
packet.frameType = kVideoFrameKey; packet.frameType = kVideoFrameKey;
packet.is_first_packet_in_frame = true; packet.is_first_packet_in_frame = true;
packet.markerBit = false; packet.is_last_packet_in_frame = false;
packet.timesNacked = 0; packet.timesNacked = 0;
packet_buffer_->InsertPacket(&packet); packet_buffer_->InsertPacket(&packet);
@ -172,7 +172,7 @@ TEST_F(TestPacketBuffer, NackCount) {
packet_buffer_->InsertPacket(&packet); packet_buffer_->InsertPacket(&packet);
packet.seqNum++; packet.seqNum++;
packet.markerBit = true; packet.is_last_packet_in_frame = true;
packet.timesNacked = 1; packet.timesNacked = 1;
packet_buffer_->InsertPacket(&packet); packet_buffer_->InsertPacket(&packet);
@ -524,7 +524,7 @@ class TestPacketBufferH264 : public TestPacketBuffer {
} }
} }
packet.is_first_packet_in_frame = first == kFirst; packet.is_first_packet_in_frame = first == kFirst;
packet.markerBit = last == kLast; packet.is_last_packet_in_frame = last == kLast;
packet.sizeBytes = data_size; packet.sizeBytes = data_size;
packet.dataPtr = data; packet.dataPtr = data;
@ -605,7 +605,7 @@ TEST_P(TestPacketBufferH264Parameterized, GetBitstreamBufferPadding) {
packet.dataPtr = data; packet.dataPtr = data;
packet.sizeBytes = sizeof(data_data); packet.sizeBytes = sizeof(data_data);
packet.is_first_packet_in_frame = true; packet.is_first_packet_in_frame = true;
packet.markerBit = true; packet.is_last_packet_in_frame = true;
packet_buffer_->InsertPacket(&packet); packet_buffer_->InsertPacket(&packet);
ASSERT_EQ(1UL, frames_from_callback_.size()); ASSERT_EQ(1UL, frames_from_callback_.size());
@ -748,7 +748,7 @@ TEST_F(TestPacketBuffer, PacketTimestamps) {
TEST_F(TestPacketBuffer, IncomingCodecChange) { TEST_F(TestPacketBuffer, IncomingCodecChange) {
VCMPacket packet; VCMPacket packet;
packet.is_first_packet_in_frame = true; packet.is_first_packet_in_frame = true;
packet.markerBit = true; packet.is_last_packet_in_frame = true;
packet.sizeBytes = 0; packet.sizeBytes = 0;
packet.dataPtr = nullptr; packet.dataPtr = nullptr;
@ -783,7 +783,7 @@ TEST_F(TestPacketBuffer, TooManyNalusInPacket) {
packet.seqNum = 1; packet.seqNum = 1;
packet.frameType = kVideoFrameKey; packet.frameType = kVideoFrameKey;
packet.is_first_packet_in_frame = true; packet.is_first_packet_in_frame = true;
packet.markerBit = true; packet.is_last_packet_in_frame = true;
auto& h264_header = auto& h264_header =
packet.video_header.video_type_header.emplace<RTPVideoHeaderH264>(); packet.video_header.video_type_header.emplace<RTPVideoHeaderH264>();
h264_header.nalus_length = kMaxNalusPerPacket; h264_header.nalus_length = kMaxNalusPerPacket;
@ -867,7 +867,7 @@ class TestPacketBufferH264XIsKeyframe : public TestPacketBufferH264 {
packet_.seqNum = kSeqNum; packet_.seqNum = kSeqNum;
packet_.is_first_packet_in_frame = true; packet_.is_first_packet_in_frame = true;
packet_.markerBit = true; packet_.is_last_packet_in_frame = true;
} }
VCMPacket packet_; VCMPacket packet_;

8
video/rtp_video_stream_receiver.cc
View File

@ -454,6 +454,8 @@ void RtpVideoStreamReceiver::ReceivePacket(const RtpPacketReceived& packet) {
VideoSendTiming::kInvalid; VideoSendTiming::kInvalid;
webrtc_rtp_header.video_header().playout_delay.min_ms = -1; webrtc_rtp_header.video_header().playout_delay.min_ms = -1;
webrtc_rtp_header.video_header().playout_delay.max_ms = -1; webrtc_rtp_header.video_header().playout_delay.max_ms = -1;
webrtc_rtp_header.video_header().is_last_packet_in_frame =
webrtc_rtp_header.header.markerBit;
packet.GetExtension<VideoOrientation>( packet.GetExtension<VideoOrientation>(
&webrtc_rtp_header.video_header().rotation); &webrtc_rtp_header.video_header().rotation);
@ -470,8 +472,10 @@ void RtpVideoStreamReceiver::ReceivePacket(const RtpPacketReceived& packet) {
webrtc_rtp_header.video_header().is_first_packet_in_frame = webrtc_rtp_header.video_header().is_first_packet_in_frame =
generic_descriptor_wire.FirstSubFrameInFrame() && generic_descriptor_wire.FirstSubFrameInFrame() &&
generic_descriptor_wire.FirstPacketInSubFrame(); generic_descriptor_wire.FirstPacketInSubFrame();
// TODO(philipel): Add is_last_packet_in_frame to the RtpVideoHeader and use webrtc_rtp_header.video_header().is_last_packet_in_frame =
// the information from the generic descriptor to set it. webrtc_rtp_header.header.markerBit ||
(generic_descriptor_wire.LastSubFrameInFrame() &&
generic_descriptor_wire.LastPacketInSubFrame());
// For now we store the diffs in |generic_descirptor.dependencies|. They // For now we store the diffs in |generic_descirptor.dependencies|. They
// are later recaculated when the frame id is unwrapped. // are later recaculated when the frame id is unwrapped.

14
video/rtp_video_stream_receiver_unittest.cc
View File

@ -205,8 +205,8 @@ TEST_F(RtpVideoStreamReceiverTest, GenericKeyFrame) {
WebRtcRTPHeader rtp_header = {}; WebRtcRTPHeader rtp_header = {};
const std::vector<uint8_t> data({1, 2, 3, 4}); const std::vector<uint8_t> data({1, 2, 3, 4});
rtp_header.header.sequenceNumber = 1; rtp_header.header.sequenceNumber = 1;
rtp_header.header.markerBit = 1;
rtp_header.video_header().is_first_packet_in_frame = true; rtp_header.video_header().is_first_packet_in_frame = true;
rtp_header.video_header().is_last_packet_in_frame = true;
rtp_header.frameType = kVideoFrameKey; rtp_header.frameType = kVideoFrameKey;
rtp_header.video_header().codec = kVideoCodecGeneric; rtp_header.video_header().codec = kVideoCodecGeneric;
mock_on_complete_frame_callback_.AppendExpectedBitstream(data.data(), mock_on_complete_frame_callback_.AppendExpectedBitstream(data.data(),
@ -262,8 +262,8 @@ TEST_F(RtpVideoStreamReceiverTest, GenericKeyFrameBitstreamError) {
WebRtcRTPHeader rtp_header = {}; WebRtcRTPHeader rtp_header = {};
const std::vector<uint8_t> data({1, 2, 3, 4}); const std::vector<uint8_t> data({1, 2, 3, 4});
rtp_header.header.sequenceNumber = 1; rtp_header.header.sequenceNumber = 1;
rtp_header.header.markerBit = 1;
rtp_header.video_header().is_first_packet_in_frame = true; rtp_header.video_header().is_first_packet_in_frame = true;
rtp_header.video_header().is_last_packet_in_frame = true;
rtp_header.frameType = kVideoFrameKey; rtp_header.frameType = kVideoFrameKey;
rtp_header.video_header().codec = kVideoCodecGeneric; rtp_header.video_header().codec = kVideoCodecGeneric;
constexpr uint8_t expected_bitsteam[] = {1, 2, 3, 0xff}; constexpr uint8_t expected_bitsteam[] = {1, 2, 3, 0xff};
@ -315,9 +315,9 @@ TEST_P(RtpVideoStreamReceiverTestH264, InBandSpsPps) {
std::vector<uint8_t> idr_data; std::vector<uint8_t> idr_data;
WebRtcRTPHeader idr_packet = GetDefaultPacket(); WebRtcRTPHeader idr_packet = GetDefaultPacket();
AddIdr(&idr_packet, 1); AddIdr(&idr_packet, 1);
idr_packet.video_header().is_first_packet_in_frame = true;
idr_packet.header.sequenceNumber = 2; idr_packet.header.sequenceNumber = 2;
idr_packet.header.markerBit = 1; idr_packet.video_header().is_first_packet_in_frame = true;
idr_packet.video_header().is_last_packet_in_frame = true;
idr_packet.frameType = kVideoFrameKey; idr_packet.frameType = kVideoFrameKey;
idr_data.insert(idr_data.end(), {0x65, 1, 2, 3}); idr_data.insert(idr_data.end(), {0x65, 1, 2, 3});
mock_on_complete_frame_callback_.AppendExpectedBitstream( mock_on_complete_frame_callback_.AppendExpectedBitstream(
@ -357,8 +357,8 @@ TEST_P(RtpVideoStreamReceiverTestH264, OutOfBandFmtpSpsPps) {
idr_packet.header.payloadType = kPayloadType; idr_packet.header.payloadType = kPayloadType;
idr_packet.video_header().is_first_packet_in_frame = true; idr_packet.video_header().is_first_packet_in_frame = true;
idr_packet.header.sequenceNumber = 2; idr_packet.header.sequenceNumber = 2;
idr_packet.header.markerBit = 1;
idr_packet.video_header().is_first_packet_in_frame = true; idr_packet.video_header().is_first_packet_in_frame = true;
idr_packet.video_header().is_last_packet_in_frame = true;
idr_packet.frameType = kVideoFrameKey; idr_packet.frameType = kVideoFrameKey;
idr_packet.video_header().codec = kVideoCodecH264; idr_packet.video_header().codec = kVideoCodecH264;
data.insert(data.end(), {1, 2, 3}); data.insert(data.end(), {1, 2, 3});
@ -377,8 +377,8 @@ TEST_F(RtpVideoStreamReceiverTest, PaddingInMediaStream) {
data.insert(data.end(), {1, 2, 3}); data.insert(data.end(), {1, 2, 3});
header.header.payloadType = 99; header.header.payloadType = 99;
header.video_header().is_first_packet_in_frame = true; header.video_header().is_first_packet_in_frame = true;
header.video_header().is_last_packet_in_frame = true;
header.header.sequenceNumber = 2; header.header.sequenceNumber = 2;
header.header.markerBit = true;
header.frameType = kVideoFrameKey; header.frameType = kVideoFrameKey;
header.video_header().codec = kVideoCodecGeneric; header.video_header().codec = kVideoCodecGeneric;
mock_on_complete_frame_callback_.AppendExpectedBitstream(data.data(), mock_on_complete_frame_callback_.AppendExpectedBitstream(data.data(),
@ -410,8 +410,8 @@ TEST_F(RtpVideoStreamReceiverTest, RequestKeyframeIfFirstFrameIsDelta) {
WebRtcRTPHeader rtp_header = {}; WebRtcRTPHeader rtp_header = {};
const std::vector<uint8_t> data({1, 2, 3, 4}); const std::vector<uint8_t> data({1, 2, 3, 4});
rtp_header.header.sequenceNumber = 1; rtp_header.header.sequenceNumber = 1;
rtp_header.header.markerBit = 1;
rtp_header.video_header().is_first_packet_in_frame = true; rtp_header.video_header().is_first_packet_in_frame = true;
rtp_header.video_header().is_last_packet_in_frame = true;
rtp_header.frameType = kVideoFrameDelta; rtp_header.frameType = kVideoFrameDelta;
rtp_header.video_header().codec = kVideoCodecGeneric; rtp_header.video_header().codec = kVideoCodecGeneric;