mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 06:10:40 +01:00
2234121cfb
We previously always set VCMNaluCompleteness to kNaluComplete for kVideoCodecGeneric, which seems wrong. This CL fixes that and also cleans up the code a bit. The logic for VP8, VP9, and H264 should be exactly preserved. This CL also updates the test to use kVideoCodecGeneric instead of kVideoCodecUnknown. kVideoCodecUnknown has no purpose and should be removed. Bug: webrtc:9516 Change-Id: Ib8d2bf6a04d41b91c5774531f3a669edce3c6cb2 Reviewed-on: https://webrtc-review.googlesource.com/88181 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23933}
82 lines
2.5 KiB
C++
82 lines
2.5 KiB
C++
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/video_coding/packet.h"
|
|
|
|
#include <assert.h>
|
|
|
|
#include "modules/include/module_common_types.h"
|
|
|
|
namespace webrtc {
|
|
|
|
VCMPacket::VCMPacket()
|
|
: payloadType(0),
|
|
timestamp(0),
|
|
ntp_time_ms_(0),
|
|
seqNum(0),
|
|
dataPtr(NULL),
|
|
sizeBytes(0),
|
|
markerBit(false),
|
|
timesNacked(-1),
|
|
frameType(kEmptyFrame),
|
|
codec(kVideoCodecUnknown),
|
|
is_first_packet_in_frame(false),
|
|
completeNALU(kNaluUnset),
|
|
insertStartCode(false),
|
|
width(0),
|
|
height(0),
|
|
video_header(),
|
|
receive_time_ms(0) {
|
|
video_header.playout_delay = {-1, -1};
|
|
}
|
|
|
|
VCMPacket::VCMPacket(const uint8_t* ptr,
|
|
const size_t size,
|
|
const WebRtcRTPHeader& rtpHeader)
|
|
: payloadType(rtpHeader.header.payloadType),
|
|
timestamp(rtpHeader.header.timestamp),
|
|
ntp_time_ms_(rtpHeader.ntp_time_ms),
|
|
seqNum(rtpHeader.header.sequenceNumber),
|
|
dataPtr(ptr),
|
|
sizeBytes(size),
|
|
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),
|
|
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) {
|
|
completeNALU = kNaluComplete;
|
|
} else if (is_first_packet_in_frame) {
|
|
completeNALU = kNaluStart;
|
|
} else if (markerBit) {
|
|
completeNALU = kNaluEnd;
|
|
} else {
|
|
completeNALU = kNaluIncomplete;
|
|
}
|
|
|
|
if (markerBit) {
|
|
video_header.rotation = rtpHeader.video_header().rotation;
|
|
}
|
|
// 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 {
|
|
video_header.playout_delay = {-1, -1};
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|