WebRtc_Word32 => int32_t for rtp_rtcp/
BUG=314
Review URL: https://webrtc-codereview.appspot.com/1279007
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3777 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 53670f9..76cc316 100644
--- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -22,137 +22,137 @@
class MockRtpRtcp : public RtpRtcp {
public:
MOCK_METHOD1(ChangeUniqueId,
- WebRtc_Word32(const WebRtc_Word32 id));
+ int32_t(const int32_t id));
MOCK_METHOD1(RegisterDefaultModule,
- WebRtc_Word32(RtpRtcp* module));
+ int32_t(RtpRtcp* module));
MOCK_METHOD0(DeRegisterDefaultModule,
- WebRtc_Word32());
+ int32_t());
MOCK_METHOD0(DefaultModuleRegistered,
bool());
MOCK_METHOD0(NumberChildModules,
- WebRtc_UWord32());
+ uint32_t());
MOCK_METHOD1(RegisterSyncModule,
- WebRtc_Word32(RtpRtcp* module));
+ int32_t(RtpRtcp* module));
MOCK_METHOD0(DeRegisterSyncModule,
- WebRtc_Word32());
+ int32_t());
MOCK_METHOD0(InitReceiver,
- WebRtc_Word32());
+ int32_t());
MOCK_METHOD1(RegisterIncomingDataCallback,
- WebRtc_Word32(RtpData* incomingDataCallback));
+ int32_t(RtpData* incomingDataCallback));
MOCK_METHOD1(RegisterIncomingRTPCallback,
- WebRtc_Word32(RtpFeedback* incomingMessagesCallback));
+ int32_t(RtpFeedback* incomingMessagesCallback));
MOCK_METHOD2(SetPacketTimeout,
- WebRtc_Word32(const WebRtc_UWord32 RTPtimeoutMS, const WebRtc_UWord32 RTCPtimeoutMS));
+ int32_t(const uint32_t RTPtimeoutMS, const uint32_t RTCPtimeoutMS));
MOCK_METHOD2(SetPeriodicDeadOrAliveStatus,
- WebRtc_Word32(const bool enable, const WebRtc_UWord8 sampleTimeSeconds));
+ int32_t(const bool enable, const uint8_t sampleTimeSeconds));
MOCK_METHOD2(PeriodicDeadOrAliveStatus,
- WebRtc_Word32(bool &enable, WebRtc_UWord8 &sampleTimeSeconds));
+ int32_t(bool &enable, uint8_t &sampleTimeSeconds));
MOCK_METHOD1(RegisterReceivePayload,
- WebRtc_Word32(const CodecInst& voiceCodec));
+ int32_t(const CodecInst& voiceCodec));
MOCK_METHOD1(RegisterReceivePayload,
- WebRtc_Word32(const VideoCodec& videoCodec));
+ int32_t(const VideoCodec& videoCodec));
MOCK_METHOD2(ReceivePayloadType,
- WebRtc_Word32(const CodecInst& voiceCodec, WebRtc_Word8* plType));
+ int32_t(const CodecInst& voiceCodec, int8_t* plType));
MOCK_METHOD2(ReceivePayloadType,
- WebRtc_Word32(const VideoCodec& videoCodec, WebRtc_Word8* plType));
+ int32_t(const VideoCodec& videoCodec, int8_t* plType));
MOCK_METHOD1(DeRegisterReceivePayload,
- WebRtc_Word32(const WebRtc_Word8 payloadType));
+ int32_t(const int8_t payloadType));
MOCK_METHOD2(RegisterReceiveRtpHeaderExtension,
- WebRtc_Word32(const RTPExtensionType type, const WebRtc_UWord8 id));
+ int32_t(const RTPExtensionType type, const uint8_t id));
MOCK_METHOD1(DeregisterReceiveRtpHeaderExtension,
- WebRtc_Word32(const RTPExtensionType type));
+ int32_t(const RTPExtensionType type));
MOCK_CONST_METHOD0(RemoteTimestamp,
- WebRtc_UWord32());
+ uint32_t());
MOCK_CONST_METHOD0(LocalTimeOfRemoteTimeStamp,
int64_t());
MOCK_CONST_METHOD1(EstimatedRemoteTimeStamp,
- WebRtc_Word32(WebRtc_UWord32& timestamp));
+ int32_t(uint32_t& timestamp));
MOCK_CONST_METHOD0(RemoteSSRC,
- WebRtc_UWord32());
+ uint32_t());
MOCK_CONST_METHOD1(RemoteCSRCs,
- WebRtc_Word32(WebRtc_UWord32 arrOfCSRC[kRtpCsrcSize]));
+ int32_t(uint32_t arrOfCSRC[kRtpCsrcSize]));
MOCK_CONST_METHOD1(SSRCFilter,
- WebRtc_Word32(WebRtc_UWord32& allowedSSRC));
+ int32_t(uint32_t& allowedSSRC));
MOCK_METHOD2(SetSSRCFilter,
- WebRtc_Word32(const bool enable, const WebRtc_UWord32 allowedSSRC));
+ int32_t(const bool enable, const uint32_t allowedSSRC));
MOCK_METHOD2(SetRTXReceiveStatus,
- WebRtc_Word32(const bool enable, const WebRtc_UWord32 SSRC));
+ int32_t(const bool enable, const uint32_t SSRC));
MOCK_CONST_METHOD2(RTXReceiveStatus,
- WebRtc_Word32(bool* enable, WebRtc_UWord32* SSRC));
+ int32_t(bool* enable, uint32_t* SSRC));
MOCK_METHOD2(IncomingPacket,
- WebRtc_Word32(const WebRtc_UWord8* incomingPacket, const WebRtc_UWord16 packetLength));
+ int32_t(const uint8_t* incomingPacket, const uint16_t packetLength));
MOCK_METHOD4(IncomingAudioNTP,
- WebRtc_Word32(const WebRtc_UWord32 audioReceivedNTPsecs,
- const WebRtc_UWord32 audioReceivedNTPfrac,
- const WebRtc_UWord32 audioRTCPArrivalTimeSecs,
- const WebRtc_UWord32 audioRTCPArrivalTimeFrac));
+ int32_t(const uint32_t audioReceivedNTPsecs,
+ const uint32_t audioReceivedNTPfrac,
+ const uint32_t audioRTCPArrivalTimeSecs,
+ const uint32_t audioRTCPArrivalTimeFrac));
MOCK_METHOD0(InitSender,
- WebRtc_Word32());
+ int32_t());
MOCK_METHOD1(RegisterSendTransport,
- WebRtc_Word32(Transport* outgoingTransport));
+ int32_t(Transport* outgoingTransport));
MOCK_METHOD1(SetMaxTransferUnit,
- WebRtc_Word32(const WebRtc_UWord16 size));
+ int32_t(const uint16_t size));
MOCK_METHOD3(SetTransportOverhead,
- WebRtc_Word32(const bool TCP, const bool IPV6,
- const WebRtc_UWord8 authenticationOverhead));
+ int32_t(const bool TCP, const bool IPV6,
+ const uint8_t authenticationOverhead));
MOCK_CONST_METHOD0(MaxPayloadLength,
- WebRtc_UWord16());
+ uint16_t());
MOCK_CONST_METHOD0(MaxDataPayloadLength,
- WebRtc_UWord16());
+ uint16_t());
MOCK_METHOD1(RegisterSendPayload,
- WebRtc_Word32(const CodecInst& voiceCodec));
+ int32_t(const CodecInst& voiceCodec));
MOCK_METHOD1(RegisterSendPayload,
- WebRtc_Word32(const VideoCodec& videoCodec));
+ int32_t(const VideoCodec& videoCodec));
MOCK_METHOD1(DeRegisterSendPayload,
- WebRtc_Word32(const WebRtc_Word8 payloadType));
+ int32_t(const int8_t payloadType));
MOCK_METHOD2(RegisterSendRtpHeaderExtension,
- WebRtc_Word32(const RTPExtensionType type, const WebRtc_UWord8 id));
+ int32_t(const RTPExtensionType type, const uint8_t id));
MOCK_METHOD1(DeregisterSendRtpHeaderExtension,
- WebRtc_Word32(const RTPExtensionType type));
+ int32_t(const RTPExtensionType type));
MOCK_CONST_METHOD0(StartTimestamp,
- WebRtc_UWord32());
+ uint32_t());
MOCK_METHOD1(SetStartTimestamp,
- WebRtc_Word32(const WebRtc_UWord32 timestamp));
+ int32_t(const uint32_t timestamp));
MOCK_CONST_METHOD0(SequenceNumber,
- WebRtc_UWord16());
+ uint16_t());
MOCK_METHOD1(SetSequenceNumber,
- WebRtc_Word32(const WebRtc_UWord16 seq));
+ int32_t(const uint16_t seq));
MOCK_CONST_METHOD0(SSRC,
- WebRtc_UWord32());
+ uint32_t());
MOCK_METHOD1(SetSSRC,
- WebRtc_Word32(const WebRtc_UWord32 ssrc));
+ int32_t(const uint32_t ssrc));
MOCK_CONST_METHOD1(CSRCs,
- WebRtc_Word32(WebRtc_UWord32 arrOfCSRC[kRtpCsrcSize]));
+ int32_t(uint32_t arrOfCSRC[kRtpCsrcSize]));
MOCK_METHOD2(SetCSRCs,
- WebRtc_Word32(const WebRtc_UWord32 arrOfCSRC[kRtpCsrcSize], const WebRtc_UWord8 arrLength));
+ int32_t(const uint32_t arrOfCSRC[kRtpCsrcSize], const uint8_t arrLength));
MOCK_METHOD1(SetCSRCStatus,
- WebRtc_Word32(const bool include));
+ int32_t(const bool include));
MOCK_METHOD3(SetRTXSendStatus,
- WebRtc_Word32(const RtxMode mode, const bool setSSRC,
- const WebRtc_UWord32 SSRC));
+ int32_t(const RtxMode mode, const bool setSSRC,
+ const uint32_t SSRC));
MOCK_CONST_METHOD2(RTXSendStatus,
- WebRtc_Word32(RtxMode* mode, WebRtc_UWord32* SSRC));
+ int32_t(RtxMode* mode, uint32_t* SSRC));
MOCK_METHOD1(SetSendingStatus,
- WebRtc_Word32(const bool sending));
+ int32_t(const bool sending));
MOCK_CONST_METHOD0(Sending,
bool());
MOCK_METHOD1(SetSendingMediaStatus,
- WebRtc_Word32(const bool sending));
+ int32_t(const bool sending));
MOCK_CONST_METHOD0(SendingMedia,
bool());
MOCK_CONST_METHOD4(BitrateSent,
- void(WebRtc_UWord32* totalRate, WebRtc_UWord32* videoRate, WebRtc_UWord32* fecRate, WebRtc_UWord32* nackRate));
+ void(uint32_t* totalRate, uint32_t* videoRate, uint32_t* fecRate, uint32_t* nackRate));
MOCK_CONST_METHOD1(EstimatedReceiveBandwidth,
- int(WebRtc_UWord32* available_bandwidth));
+ int(uint32_t* available_bandwidth));
MOCK_METHOD8(SendOutgoingData,
- WebRtc_Word32(const FrameType frameType,
- const WebRtc_Word8 payloadType,
- const WebRtc_UWord32 timeStamp,
- int64_t capture_time_ms,
- const WebRtc_UWord8* payloadData,
- const WebRtc_UWord32 payloadSize,
- const RTPFragmentationHeader* fragmentation,
- const RTPVideoHeader* rtpVideoHdr));
+ int32_t(const FrameType frameType,
+ const int8_t payloadType,
+ const uint32_t timeStamp,
+ int64_t capture_time_ms,
+ const uint8_t* payloadData,
+ const uint32_t payloadSize,
+ const RTPFragmentationHeader* fragmentation,
+ const RTPVideoHeader* rtpVideoHdr));
MOCK_METHOD3(TimeToSendPacket,
void(uint32_t ssrc, uint16_t sequence_number, int64_t capture_time_ms));
MOCK_METHOD3(RegisterRtcpObservers,
@@ -162,124 +162,124 @@
MOCK_CONST_METHOD0(RTCP,
RTCPMethod());
MOCK_METHOD1(SetRTCPStatus,
- WebRtc_Word32(const RTCPMethod method));
+ int32_t(const RTCPMethod method));
MOCK_METHOD1(SetCNAME,
- WebRtc_Word32(const char cName[RTCP_CNAME_SIZE]));
+ int32_t(const char cName[RTCP_CNAME_SIZE]));
MOCK_METHOD1(CNAME,
- WebRtc_Word32(char cName[RTCP_CNAME_SIZE]));
+ int32_t(char cName[RTCP_CNAME_SIZE]));
MOCK_CONST_METHOD2(RemoteCNAME,
- WebRtc_Word32(const WebRtc_UWord32 remoteSSRC,
- char cName[RTCP_CNAME_SIZE]));
+ int32_t(const uint32_t remoteSSRC,
+ char cName[RTCP_CNAME_SIZE]));
MOCK_CONST_METHOD5(RemoteNTP,
- WebRtc_Word32(WebRtc_UWord32 *ReceivedNTPsecs,
- WebRtc_UWord32 *ReceivedNTPfrac,
- WebRtc_UWord32 *RTCPArrivalTimeSecs,
- WebRtc_UWord32 *RTCPArrivalTimeFrac,
- WebRtc_UWord32 *rtcp_timestamp));
+ int32_t(uint32_t *ReceivedNTPsecs,
+ uint32_t *ReceivedNTPfrac,
+ uint32_t *RTCPArrivalTimeSecs,
+ uint32_t *RTCPArrivalTimeFrac,
+ uint32_t *rtcp_timestamp));
MOCK_METHOD2(AddMixedCNAME,
- WebRtc_Word32(const WebRtc_UWord32 SSRC,
- const char cName[RTCP_CNAME_SIZE]));
+ int32_t(const uint32_t SSRC,
+ const char cName[RTCP_CNAME_SIZE]));
MOCK_METHOD1(RemoveMixedCNAME,
- WebRtc_Word32(const WebRtc_UWord32 SSRC));
+ int32_t(const uint32_t SSRC));
MOCK_CONST_METHOD5(RTT,
- WebRtc_Word32(const WebRtc_UWord32 remoteSSRC, WebRtc_UWord16* RTT, WebRtc_UWord16* avgRTT, WebRtc_UWord16* minRTT, WebRtc_UWord16* maxRTT));
+ int32_t(const uint32_t remoteSSRC, uint16_t* RTT, uint16_t* avgRTT, uint16_t* minRTT, uint16_t* maxRTT));
MOCK_METHOD1(ResetRTT,
- WebRtc_Word32(const WebRtc_UWord32 remoteSSRC));
+ int32_t(const uint32_t remoteSSRC));
MOCK_METHOD1(SetRtt, void(uint32_t rtt));
MOCK_METHOD1(SendRTCP,
- WebRtc_Word32(WebRtc_UWord32 rtcpPacketType));
+ int32_t(uint32_t rtcpPacketType));
MOCK_METHOD1(SendRTCPReferencePictureSelection,
- WebRtc_Word32(const WebRtc_UWord64 pictureID));
+ int32_t(const uint64_t pictureID));
MOCK_METHOD1(SendRTCPSliceLossIndication,
- WebRtc_Word32(const WebRtc_UWord8 pictureID));
+ int32_t(const uint8_t pictureID));
MOCK_METHOD0(ResetStatisticsRTP,
- WebRtc_Word32());
+ int32_t());
MOCK_CONST_METHOD5(StatisticsRTP,
- WebRtc_Word32(WebRtc_UWord8 *fraction_lost, WebRtc_UWord32 *cum_lost, WebRtc_UWord32 *ext_max, WebRtc_UWord32 *jitter, WebRtc_UWord32 *max_jitter));
+ int32_t(uint8_t *fraction_lost, uint32_t *cum_lost, uint32_t *ext_max, uint32_t *jitter, uint32_t *max_jitter));
MOCK_METHOD0(ResetReceiveDataCountersRTP,
- WebRtc_Word32());
+ int32_t());
MOCK_METHOD0(ResetSendDataCountersRTP,
- WebRtc_Word32());
+ int32_t());
MOCK_CONST_METHOD4(DataCountersRTP,
- WebRtc_Word32(WebRtc_UWord32 *bytesSent, WebRtc_UWord32 *packetsSent, WebRtc_UWord32 *bytesReceived, WebRtc_UWord32 *packetsReceived));
+ int32_t(uint32_t *bytesSent, uint32_t *packetsSent, uint32_t *bytesReceived, uint32_t *packetsReceived));
MOCK_METHOD1(RemoteRTCPStat,
- WebRtc_Word32(RTCPSenderInfo* senderInfo));
+ int32_t(RTCPSenderInfo* senderInfo));
MOCK_CONST_METHOD1(RemoteRTCPStat,
- WebRtc_Word32(std::vector<RTCPReportBlock>* receiveBlocks));
+ int32_t(std::vector<RTCPReportBlock>* receiveBlocks));
MOCK_METHOD2(AddRTCPReportBlock,
- WebRtc_Word32(const WebRtc_UWord32 SSRC, const RTCPReportBlock* receiveBlock));
+ int32_t(const uint32_t SSRC, const RTCPReportBlock* receiveBlock));
MOCK_METHOD1(RemoveRTCPReportBlock,
- WebRtc_Word32(const WebRtc_UWord32 SSRC));
+ int32_t(const uint32_t SSRC));
MOCK_METHOD4(SetRTCPApplicationSpecificData,
- WebRtc_Word32(const WebRtc_UWord8 subType, const WebRtc_UWord32 name, const WebRtc_UWord8* data, const WebRtc_UWord16 length));
+ int32_t(const uint8_t subType, const uint32_t name, const uint8_t* data, const uint16_t length));
MOCK_METHOD1(SetRTCPVoIPMetrics,
- WebRtc_Word32(const RTCPVoIPMetric* VoIPMetric));
+ int32_t(const RTCPVoIPMetric* VoIPMetric));
MOCK_CONST_METHOD0(REMB,
bool());
MOCK_METHOD1(SetREMBStatus,
- WebRtc_Word32(const bool enable));
+ int32_t(const bool enable));
MOCK_METHOD3(SetREMBData,
- WebRtc_Word32(const WebRtc_UWord32 bitrate, const WebRtc_UWord8 numberOfSSRC, const WebRtc_UWord32* SSRC));
+ int32_t(const uint32_t bitrate, const uint8_t numberOfSSRC, const uint32_t* SSRC));
MOCK_METHOD1(SetRemoteBitrateObserver,
bool(RemoteBitrateObserver*));
MOCK_CONST_METHOD0(IJ,
bool());
MOCK_METHOD1(SetIJStatus,
- WebRtc_Word32(const bool));
+ int32_t(const bool));
MOCK_CONST_METHOD0(TMMBR,
bool());
MOCK_METHOD1(SetTMMBRStatus,
- WebRtc_Word32(const bool enable));
+ int32_t(const bool enable));
MOCK_METHOD1(OnBandwidthEstimateUpdate,
- void(WebRtc_UWord16 bandWidthKbit));
+ void(uint16_t bandWidthKbit));
MOCK_CONST_METHOD0(NACK,
NACKMethod());
MOCK_METHOD2(SetNACKStatus,
- WebRtc_Word32(const NACKMethod method, int oldestSequenceNumberToNack));
+ int32_t(const NACKMethod method, int oldestSequenceNumberToNack));
MOCK_CONST_METHOD0(SelectiveRetransmissions,
int());
MOCK_METHOD1(SetSelectiveRetransmissions,
int(uint8_t settings));
MOCK_METHOD2(SendNACK,
- WebRtc_Word32(const WebRtc_UWord16* nackList, const WebRtc_UWord16 size));
+ int32_t(const uint16_t* nackList, const uint16_t size));
MOCK_METHOD2(SetStorePacketsStatus,
- WebRtc_Word32(const bool enable, const WebRtc_UWord16 numberToStore));
+ int32_t(const bool enable, const uint16_t numberToStore));
MOCK_METHOD1(RegisterAudioCallback,
- WebRtc_Word32(RtpAudioFeedback* messagesCallback));
+ int32_t(RtpAudioFeedback* messagesCallback));
MOCK_METHOD1(SetAudioPacketSize,
- WebRtc_Word32(const WebRtc_UWord16 packetSizeSamples));
+ int32_t(const uint16_t packetSizeSamples));
MOCK_METHOD1(SetTelephoneEventForwardToDecoder, int(bool forwardToDecoder));
MOCK_CONST_METHOD0(TelephoneEventForwardToDecoder,
bool());
MOCK_CONST_METHOD1(SendTelephoneEventActive,
- bool(WebRtc_Word8& telephoneEvent));
+ bool(int8_t& telephoneEvent));
MOCK_METHOD3(SendTelephoneEventOutband,
- WebRtc_Word32(const WebRtc_UWord8 key, const WebRtc_UWord16 time_ms, const WebRtc_UWord8 level));
+ int32_t(const uint8_t key, const uint16_t time_ms, const uint8_t level));
MOCK_METHOD1(SetSendREDPayloadType,
- WebRtc_Word32(const WebRtc_Word8 payloadType));
+ int32_t(const int8_t payloadType));
MOCK_CONST_METHOD1(SendREDPayloadType,
- WebRtc_Word32(WebRtc_Word8& payloadType));
+ int32_t(int8_t& payloadType));
MOCK_METHOD2(SetRTPAudioLevelIndicationStatus,
- WebRtc_Word32(const bool enable, const WebRtc_UWord8 ID));
+ int32_t(const bool enable, const uint8_t ID));
MOCK_CONST_METHOD2(GetRTPAudioLevelIndicationStatus,
- WebRtc_Word32(bool& enable, WebRtc_UWord8& ID));
+ int32_t(bool& enable, uint8_t& ID));
MOCK_METHOD1(SetAudioLevel,
- WebRtc_Word32(const WebRtc_UWord8 level_dBov));
+ int32_t(const uint8_t level_dBov));
MOCK_METHOD1(SetCameraDelay,
- WebRtc_Word32(const WebRtc_Word32 delayMS));
+ int32_t(const int32_t delayMS));
MOCK_METHOD1(SetTargetSendBitrate,
- void(const WebRtc_UWord32 bitrate));
+ void(const uint32_t bitrate));
MOCK_METHOD3(SetGenericFECStatus,
- WebRtc_Word32(const bool enable, const WebRtc_UWord8 payloadTypeRED, const WebRtc_UWord8 payloadTypeFEC));
+ int32_t(const bool enable, const uint8_t payloadTypeRED, const uint8_t payloadTypeFEC));
MOCK_METHOD3(GenericFECStatus,
- WebRtc_Word32(bool& enable, WebRtc_UWord8& payloadTypeRED, WebRtc_UWord8& payloadTypeFEC));
+ int32_t(bool& enable, uint8_t& payloadTypeRED, uint8_t& payloadTypeFEC));
MOCK_METHOD2(SetFecParameters,
- WebRtc_Word32(const FecProtectionParams* delta_params,
- const FecProtectionParams* key_params));
+ int32_t(const FecProtectionParams* delta_params,
+ const FecProtectionParams* key_params));
MOCK_METHOD1(SetKeyFrameRequestMethod,
- WebRtc_Word32(const KeyFrameRequestMethod method));
+ int32_t(const KeyFrameRequestMethod method));
MOCK_METHOD0(RequestKeyFrame,
- WebRtc_Word32());
+ int32_t());
MOCK_CONST_METHOD3(Version,
int32_t(char* version, uint32_t& remaining_buffer_in_bytes, uint32_t& position));
MOCK_METHOD0(TimeUntilNextProcess,