Update talk to 50918584.
Together with Stefan's http://review.webrtc.org/1960004/.
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2048004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4556 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 0d39f8b..2b6bedc 100644
--- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -35,53 +35,9 @@
int32_t(RtpRtcp* module));
MOCK_METHOD0(DeRegisterSyncModule,
int32_t());
- MOCK_METHOD0(InitReceiver,
- int32_t());
- MOCK_METHOD1(RegisterIncomingDataCallback,
- int32_t(RtpData* incomingDataCallback));
- MOCK_METHOD1(RegisterIncomingRTPCallback,
- int32_t(RtpFeedback* incomingMessagesCallback));
- MOCK_METHOD2(SetPacketTimeout,
- int32_t(const uint32_t RTPtimeoutMS, const uint32_t RTCPtimeoutMS));
- MOCK_METHOD2(SetPeriodicDeadOrAliveStatus,
- int32_t(const bool enable, const uint8_t sampleTimeSeconds));
- MOCK_METHOD2(PeriodicDeadOrAliveStatus,
- int32_t(bool &enable, uint8_t &sampleTimeSeconds));
- MOCK_METHOD1(RegisterReceivePayload,
- int32_t(const CodecInst& voiceCodec));
- MOCK_METHOD1(RegisterReceivePayload,
- int32_t(const VideoCodec& videoCodec));
- MOCK_METHOD2(ReceivePayloadType,
- int32_t(const CodecInst& voiceCodec, int8_t* plType));
- MOCK_METHOD2(ReceivePayloadType,
- int32_t(const VideoCodec& videoCodec, int8_t* plType));
- MOCK_METHOD1(DeRegisterReceivePayload,
- int32_t(const int8_t payloadType));
- MOCK_CONST_METHOD0(RemoteTimestamp,
- uint32_t());
- MOCK_CONST_METHOD0(LocalTimeOfRemoteTimeStamp,
- int64_t());
- MOCK_CONST_METHOD1(EstimatedRemoteTimeStamp,
- int32_t(uint32_t& timestamp));
- MOCK_CONST_METHOD0(RemoteSSRC,
- uint32_t());
- MOCK_CONST_METHOD1(RemoteCSRCs,
- int32_t(uint32_t arrOfCSRC[kRtpCsrcSize]));
- MOCK_CONST_METHOD1(SSRCFilter,
- int32_t(uint32_t& allowedSSRC));
- MOCK_METHOD2(SetSSRCFilter,
- int32_t(const bool enable, const uint32_t allowedSSRC));
- MOCK_METHOD2(SetRTXReceiveStatus,
- int32_t(bool enable, uint32_t ssrc));
- MOCK_CONST_METHOD3(RTXReceiveStatus,
- int32_t(bool* enable, uint32_t* ssrc, int* payload_type));
- MOCK_METHOD1(SetRtxReceivePayloadType,
- void(int));
- MOCK_METHOD3(IncomingRtpPacket,
- int32_t(const uint8_t* incomingPacket, const uint16_t packetLength,
- const webrtc::RTPHeader& header));
MOCK_METHOD2(IncomingRtcpPacket,
int32_t(const uint8_t* incomingPacket, uint16_t packetLength));
+ MOCK_METHOD1(SetRemoteSSRC, void(const uint32_t ssrc));
MOCK_METHOD4(IncomingAudioNTP,
int32_t(const uint32_t audioReceivedNTPsecs,
const uint32_t audioReceivedNTPfrac,
@@ -196,16 +152,10 @@
int32_t(const uint64_t pictureID));
MOCK_METHOD1(SendRTCPSliceLossIndication,
int32_t(const uint8_t pictureID));
- MOCK_METHOD0(ResetStatisticsRTP,
- int32_t());
- MOCK_CONST_METHOD5(StatisticsRTP,
- int32_t(uint8_t *fraction_lost, uint32_t *cum_lost, uint32_t *ext_max, uint32_t *jitter, uint32_t *max_jitter));
- MOCK_METHOD0(ResetReceiveDataCountersRTP,
- int32_t());
MOCK_METHOD0(ResetSendDataCountersRTP,
int32_t());
- MOCK_CONST_METHOD4(DataCountersRTP,
- int32_t(uint32_t *bytesSent, uint32_t *packetsSent, uint32_t *bytesReceived, uint32_t *packetsReceived));
+ MOCK_CONST_METHOD2(DataCountersRTP,
+ int32_t(uint32_t *bytesSent, uint32_t *packetsSent));
MOCK_METHOD1(RemoteRTCPStat,
int32_t(RTCPSenderInfo* senderInfo));
MOCK_CONST_METHOD1(RemoteRTCPStat,
@@ -224,8 +174,6 @@
int32_t(const bool enable));
MOCK_METHOD3(SetREMBData,
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,
@@ -248,13 +196,11 @@
int32_t(const uint16_t* nackList, const uint16_t size));
MOCK_METHOD2(SetStorePacketsStatus,
int32_t(const bool enable, const uint16_t numberToStore));
+ MOCK_CONST_METHOD0(StorePackets, bool());
MOCK_METHOD1(RegisterAudioCallback,
int32_t(RtpAudioFeedback* messagesCallback));
MOCK_METHOD1(SetAudioPacketSize,
int32_t(const uint16_t packetSizeSamples));
- MOCK_METHOD1(SetTelephoneEventForwardToDecoder, int(bool forwardToDecoder));
- MOCK_CONST_METHOD0(TelephoneEventForwardToDecoder,
- bool());
MOCK_CONST_METHOD1(SendTelephoneEventActive,
bool(int8_t& telephoneEvent));
MOCK_METHOD3(SendTelephoneEventOutband,