64c1e8cda5
All RTP packets from sender side will carry the rotation info. (will file a bug to track this) On the receiving side, only packets with marker bit set will be examined. Tests completed: 1. android standalone to android standalone 2. android standalone to chrome (with and without this change) 3. android on chrome BUG=4145 R=glaznev@webrtc.org, mflodman@webrtc.org, perkj@webrtc.org, pthatcher@webrtc.org Committed: https://crrev.com/1b1c15cad16de57053bb6aa8a916079e0534bdae Cr-Commit-Position: refs/heads/master@{#8905} Review URL: https://webrtc-codereview.appspot.com/47399004 Cr-Commit-Position: refs/heads/master@{#8917}
145 lines
3.8 KiB
C++
145 lines
3.8 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 "webrtc/modules/interface/module_common_types.h"
|
|
#include "webrtc/modules/video_coding/main/source/packet.h"
|
|
|
|
#include <assert.h>
|
|
|
|
namespace webrtc {
|
|
|
|
VCMPacket::VCMPacket()
|
|
:
|
|
payloadType(0),
|
|
timestamp(0),
|
|
ntp_time_ms_(0),
|
|
seqNum(0),
|
|
dataPtr(NULL),
|
|
sizeBytes(0),
|
|
markerBit(false),
|
|
frameType(kFrameEmpty),
|
|
codec(kVideoCodecUnknown),
|
|
isFirstPacket(false),
|
|
completeNALU(kNaluUnset),
|
|
insertStartCode(false),
|
|
width(0),
|
|
height(0),
|
|
codecSpecificHeader() {
|
|
}
|
|
|
|
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),
|
|
|
|
frameType(rtpHeader.frameType),
|
|
codec(kVideoCodecUnknown),
|
|
isFirstPacket(rtpHeader.type.Video.isFirstPacket),
|
|
completeNALU(kNaluComplete),
|
|
insertStartCode(false),
|
|
width(rtpHeader.type.Video.width),
|
|
height(rtpHeader.type.Video.height),
|
|
codecSpecificHeader(rtpHeader.type.Video)
|
|
{
|
|
CopyCodecSpecifics(rtpHeader.type.Video);
|
|
}
|
|
|
|
VCMPacket::VCMPacket(const uint8_t* ptr,
|
|
size_t size,
|
|
uint16_t seq,
|
|
uint32_t ts,
|
|
bool mBit) :
|
|
payloadType(0),
|
|
timestamp(ts),
|
|
ntp_time_ms_(0),
|
|
seqNum(seq),
|
|
dataPtr(ptr),
|
|
sizeBytes(size),
|
|
markerBit(mBit),
|
|
|
|
frameType(kVideoFrameDelta),
|
|
codec(kVideoCodecUnknown),
|
|
isFirstPacket(false),
|
|
completeNALU(kNaluComplete),
|
|
insertStartCode(false),
|
|
width(0),
|
|
height(0),
|
|
codecSpecificHeader()
|
|
{}
|
|
|
|
void VCMPacket::Reset() {
|
|
payloadType = 0;
|
|
timestamp = 0;
|
|
ntp_time_ms_ = 0;
|
|
seqNum = 0;
|
|
dataPtr = NULL;
|
|
sizeBytes = 0;
|
|
markerBit = false;
|
|
frameType = kFrameEmpty;
|
|
codec = kVideoCodecUnknown;
|
|
isFirstPacket = false;
|
|
completeNALU = kNaluUnset;
|
|
insertStartCode = false;
|
|
width = 0;
|
|
height = 0;
|
|
memset(&codecSpecificHeader, 0, sizeof(RTPVideoHeader));
|
|
}
|
|
|
|
void VCMPacket::CopyCodecSpecifics(const RTPVideoHeader& videoHeader) {
|
|
if (markerBit) {
|
|
codecSpecificHeader.rotation = videoHeader.rotation;
|
|
}
|
|
switch (videoHeader.codec) {
|
|
case kRtpVideoVp8:
|
|
// Handle all packets within a frame as depending on the previous packet
|
|
// TODO(holmer): This should be changed to make fragments independent
|
|
// when the VP8 RTP receiver supports fragments.
|
|
if (isFirstPacket && markerBit)
|
|
completeNALU = kNaluComplete;
|
|
else if (isFirstPacket)
|
|
completeNALU = kNaluStart;
|
|
else if (markerBit)
|
|
completeNALU = kNaluEnd;
|
|
else
|
|
completeNALU = kNaluIncomplete;
|
|
|
|
codec = kVideoCodecVP8;
|
|
return;
|
|
case kRtpVideoH264:
|
|
isFirstPacket = videoHeader.isFirstPacket;
|
|
if (isFirstPacket)
|
|
insertStartCode = true;
|
|
|
|
if (videoHeader.codecHeader.H264.single_nalu) {
|
|
completeNALU = kNaluComplete;
|
|
} else if (isFirstPacket) {
|
|
completeNALU = kNaluStart;
|
|
} else if (markerBit) {
|
|
completeNALU = kNaluEnd;
|
|
} else {
|
|
completeNALU = kNaluIncomplete;
|
|
}
|
|
codec = kVideoCodecH264;
|
|
return;
|
|
case kRtpVideoGeneric:
|
|
case kRtpVideoNone:
|
|
codec = kVideoCodecUnknown;
|
|
return;
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|