| Index: webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
|
| diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
|
| index 334d81172c7efd7738b9f0892d3051a3bd932936..796be1304c7035027e7ec2ec30ee87a626ee6ba3 100644
|
| --- a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
|
| +++ b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
|
| @@ -112,7 +112,10 @@ class MockRtpRtcp : public RtpRtcp {
|
| MOCK_CONST_METHOD0(SendingMedia,
|
| bool());
|
| MOCK_CONST_METHOD4(BitrateSent,
|
| - void(uint32_t* totalRate, uint32_t* videoRate, uint32_t* fecRate, uint32_t* nackRate));
|
| + void(uint32_t* totalRate,
|
| + uint32_t* videoRate,
|
| + uint32_t* fecRate,
|
| + uint32_t* nackRate));
|
| MOCK_METHOD1(RegisterVideoBitrateObserver, void(BitrateStatisticsObserver*));
|
| MOCK_CONST_METHOD0(GetVideoBitrateObserver, BitrateStatisticsObserver*(void));
|
| MOCK_CONST_METHOD1(EstimatedReceiveBandwidth,
|
| @@ -176,7 +179,10 @@ class MockRtpRtcp : public RtpRtcp {
|
| MOCK_CONST_METHOD1(RemoteRTCPStat,
|
| int32_t(std::vector<RTCPReportBlock>* receiveBlocks));
|
| MOCK_METHOD4(SetRTCPApplicationSpecificData,
|
| - int32_t(const uint8_t subType, const uint32_t name, const uint8_t* data, const uint16_t length));
|
| + int32_t(const uint8_t subType,
|
| + const uint32_t name,
|
| + const uint8_t* data,
|
| + const uint16_t length));
|
| MOCK_METHOD1(SetRTCPVoIPMetrics,
|
| int32_t(const RTCPVoIPMetric* VoIPMetric));
|
| MOCK_METHOD1(SetRtcpXrRrtrStatus,
|
| @@ -221,8 +227,6 @@ class MockRtpRtcp : public RtpRtcp {
|
| MOCK_CONST_METHOD1(SendREDPayloadType, int32_t(int8_t* payloadType));
|
| MOCK_METHOD2(SetRTPAudioLevelIndicationStatus,
|
| int32_t(const bool enable, const uint8_t ID));
|
| - MOCK_CONST_METHOD2(GetRTPAudioLevelIndicationStatus,
|
| - int32_t(bool& enable, uint8_t& ID));
|
| MOCK_METHOD1(SetAudioLevel,
|
| int32_t(const uint8_t level_dBov));
|
| MOCK_METHOD1(SetTargetSendBitrate,
|
| @@ -242,8 +246,6 @@ class MockRtpRtcp : public RtpRtcp {
|
| int32_t(const KeyFrameRequestMethod method));
|
| MOCK_METHOD0(RequestKeyFrame,
|
| int32_t());
|
| - MOCK_CONST_METHOD3(Version,
|
| - int32_t(char* version, uint32_t& remaining_buffer_in_bytes, uint32_t& position));
|
| MOCK_METHOD0(TimeUntilNextProcess,
|
| int64_t());
|
| MOCK_METHOD0(Process,
|
|
|