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

23
modules/video_coding/packet.cc
View File

@ -25,13 +25,8 @@ VCMPacket::VCMPacket()
markerBit(false),
timesNacked(-1),
frameType(kEmptyFrame),
codec(kVideoCodecGeneric),
is_first_packet_in_frame(false),
is_last_packet_in_frame(false),
completeNALU(kNaluUnset),
insertStartCode(false),
width(0),
height(0),
video_header(),
receive_time_ms(0) {
video_header.playout_delay = {-1, -1};
@ -49,19 +44,13 @@ VCMPacket::VCMPacket(const uint8_t* ptr,
markerBit(rtpHeader.header.markerBit),
timesNacked(-1),
frameType(rtpHeader.frameType),
codec(rtpHeader.video_header().codec),
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),
insertStartCode(rtpHeader.video_header().codec == kVideoCodecH264 &&
rtpHeader.video_header().is_first_packet_in_frame),
width(rtpHeader.video_header().width),
height(rtpHeader.video_header().height),
video_header(rtpHeader.video_header()) {
if (is_first_packet_in_frame && markerBit) {
if (is_first_packet_in_frame() && markerBit) {
completeNALU = kNaluComplete;
} else if (is_first_packet_in_frame) {
} else if (is_first_packet_in_frame()) {
completeNALU = kNaluStart;
} else if (markerBit) {
completeNALU = kNaluEnd;
@ -69,13 +58,9 @@ VCMPacket::VCMPacket(const uint8_t* ptr,
completeNALU = kNaluIncomplete;
}
if (markerBit) {
video_header.rotation = rtpHeader.video_header().rotation;
}
// TODO(nisse): Delete?
// Playout decisions are made entirely based on first packet in a frame.
if (is_first_packet_in_frame) {
video_header.playout_delay = rtpHeader.video_header().playout_delay;
} else {
if (!is_first_packet_in_frame()) {
video_header.playout_delay = {-1, -1};
}
}