7bb8f02274
This is accomplished by breaking out RTX and FEC/RED functionality from the RTP module and keeping track of the base payload type, that is the payload type received when not receiving RTX. Enables retransmissions over RTX by default in the loopback test. BUG=1811 TESTS=voe/vie_auto_test --automated and trybots. R=mflodman@webrtc.org, pbos@webrtc.org, xians@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2154004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4692 4adac7df-926f-26a2-2b94-8c16560cd09d
123 lines
3.3 KiB
C++
123 lines
3.3 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),
|
|
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 uint32_t size,
|
|
const WebRtcRTPHeader& rtpHeader) :
|
|
payloadType(rtpHeader.header.payloadType),
|
|
timestamp(rtpHeader.header.timestamp),
|
|
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, uint32_t size, uint16_t seq, uint32_t ts, bool mBit) :
|
|
payloadType(0),
|
|
timestamp(ts),
|
|
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;
|
|
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)
|
|
{
|
|
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;
|
|
break;
|
|
}
|
|
default:
|
|
{
|
|
codec = kVideoCodecUnknown;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|