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

WebRtc_Word32 => int32_t for rtp_rtcp/

Browse Source 
BUG=314

Review URL: https://webrtc-codereview.appspot.com/1279007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3777 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-04-08 11:08:41 +00:00
parent 367804cce2
commit 2f44673d66
86 changed files with 3934 additions and 3956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/modules/rtp_rtcp/source/receiver_fec.cc
View File

@ -19,7 +19,7 @@
// RFC 5109
namespace webrtc {
ReceiverFEC::ReceiverFEC(const WebRtc_Word32 id, RTPReceiverVideo* owner)
ReceiverFEC::ReceiverFEC(const int32_t id, RTPReceiverVideo* owner)
: _id(id),
_owner(owner),
_fec(new ForwardErrorCorrection(id)),
@ -42,7 +42,7 @@ ReceiverFEC::~ReceiverFEC() {
}
}
void ReceiverFEC::SetPayloadTypeFEC(const WebRtc_Word8 payloadType) {
void ReceiverFEC::SetPayloadTypeFEC(const int8_t payloadType) {
_payloadTypeFEC = payloadType;
}
@ -76,16 +76,16 @@ RFC 2198 RTP Payload for Redundant Audio Data September 1997
block excluding header.
*/
WebRtc_Word32 ReceiverFEC::AddReceivedFECPacket(
int32_t ReceiverFEC::AddReceivedFECPacket(
const WebRtcRTPHeader* rtpHeader,
const WebRtc_UWord8* incomingRtpPacket,
const WebRtc_UWord16 payloadDataLength,
const uint8_t* incomingRtpPacket,
const uint16_t payloadDataLength,
bool& FECpacket) {
if (_payloadTypeFEC == -1) {
return -1;
}
WebRtc_UWord8 REDHeaderLength = 1;
uint8_t REDHeaderLength = 1;
// Add to list without RED header, aka a virtual RTP packet
// we remove the RED header
@ -95,7 +95,7 @@ WebRtc_Word32 ReceiverFEC::AddReceivedFECPacket(
receivedPacket->pkt = new ForwardErrorCorrection::Packet;
// get payload type from RED header
WebRtc_UWord8 payloadType =
uint8_t payloadType =
incomingRtpPacket[rtpHeader->header.headerLength] & 0x7f;
// use the payloadType to decide if it's FEC or coded data
@ -108,11 +108,11 @@ WebRtc_Word32 ReceiverFEC::AddReceivedFECPacket(
}
receivedPacket->seqNum = rtpHeader->header.sequenceNumber;
WebRtc_UWord16 blockLength = 0;
uint16_t blockLength = 0;
if(incomingRtpPacket[rtpHeader->header.headerLength] & 0x80) {
// f bit set in RED header
REDHeaderLength = 4;
WebRtc_UWord16 timestampOffset =
uint16_t timestampOffset =
(incomingRtpPacket[rtpHeader->header.headerLength + 1]) << 8;
timestampOffset += incomingRtpPacket[rtpHeader->header.headerLength+2];
timestampOffset = timestampOffset >> 2;
@ -221,7 +221,7 @@ WebRtc_Word32 ReceiverFEC::AddReceivedFECPacket(
return 0;
}
WebRtc_Word32 ReceiverFEC::ProcessReceivedFEC() {
int32_t ReceiverFEC::ProcessReceivedFEC() {
if (!_receivedPacketList.empty()) {
// Send received media packet to VCM.
if (!_receivedPacketList.front()->isFec) {