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

Move frame_type member from RtpDepacketizer::ParsedPayload to RTPVideoHeader

Browse Source 
The latter is also a member of the former. This cleanup is also
a preparation for dropping WebRtcRTPHeader::frameType (or deleting
WebRtcRTPHeader right away), now that it's a video-specific member.


Tbr: kwiberg@webrtc.org # Comment change in modules/include/
Bug: None
Change-Id: I5c1f3f981f0d750713fc9b9b145278150fe32b5d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133024
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27740}
This commit is contained in:
Niels Möller
2019-04-24 09:41:16 +02:00
committed by Commit Bot
parent a1e4fbb253
commit abbc50e9b2
31 changed files with 200 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/video_coding/session_info.cc
View File

@ -426,7 +426,7 @@ bool VCMSessionInfo::HaveLastPacket() const {
int VCMSessionInfo::InsertPacket(const VCMPacket& packet,
uint8_t* frame_buffer,
const FrameData& frame_data) {
if (packet.frameType == VideoFrameType::kEmptyFrame) {
if (packet.video_header.frame_type == VideoFrameType::kEmptyFrame) {
// Update sequence number of an empty packet.
// Only media packets are inserted into the packet list.
InformOfEmptyPacket(packet.seqNum);
@ -451,7 +451,7 @@ int VCMSessionInfo::InsertPacket(const VCMPacket& packet,
return -2;
if (packet.codec() == kVideoCodecH264) {
frame_type_ = packet.frameType;
frame_type_ = packet.video_header.frame_type;
if (packet.is_first_packet_in_frame() &&
(first_packet_seq_num_ == -1 ||
IsNewerSequenceNumber(first_packet_seq_num_, packet.seqNum))) {
@ -470,7 +470,7 @@ int VCMSessionInfo::InsertPacket(const VCMPacket& packet,
// Should only be set for one packet per session.
if (packet.is_first_packet_in_frame() && first_packet_seq_num_ == -1) {
// The first packet in a frame signals the frame type.
frame_type_ = packet.frameType;
frame_type_ = packet.video_header.frame_type;
// Store the sequence number for the first packet.
first_packet_seq_num_ = static_cast<int>(packet.seqNum);
} else if (first_packet_seq_num_ != -1 &&
@ -480,10 +480,10 @@ int VCMSessionInfo::InsertPacket(const VCMPacket& packet,
"of frame boundaries";
return -3;
} else if (frame_type_ == VideoFrameType::kEmptyFrame &&
packet.frameType != VideoFrameType::kEmptyFrame) {
packet.video_header.frame_type != VideoFrameType::kEmptyFrame) {
// Update the frame type with the type of the first media packet.
// TODO(mikhal): Can this trigger?
frame_type_ = packet.frameType;
frame_type_ = packet.video_header.frame_type;
}
// Track the marker bit, should only be set for one packet per session.