admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide default impl of TimeUntilNextProcess in MockRtpRtcp instead of mocking.

Browse Source 
This method isn't currently mocked or required by any test, so the safe thing
is to return a reasonably large value from the implementation to avoid busy loops.

BUG=webrtc:7187
TBR=mflodman@webrtc.org

Review-Url: https://codereview.webrtc.org/2744233002
Cr-Commit-Position: refs/heads/master@{#17284}
This commit is contained in:
tommi 2017-03-17 04:01:30 -07:00 committed by Commit bot
parent 90474ccd12
commit 994ebb4702
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
View File

@ -15,6 +15,7 @@
#include <utility>
#include <vector>
#include "webrtc/base/checks.h"
#include "webrtc/base/optional.h"
#include "webrtc/modules/include/module.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
@ -194,7 +195,6 @@ class MockRtpRtcp : public RtpRtcp {
const FecProtectionParams& key_params));
MOCK_METHOD1(SetKeyFrameRequestMethod, int32_t(KeyFrameRequestMethod method));
MOCK_METHOD0(RequestKeyFrame, int32_t());
MOCK_METHOD0(TimeUntilNextProcess, int64_t());
MOCK_METHOD0(Process, void());
MOCK_METHOD1(RegisterSendFrameCountObserver, void(FrameCountObserver*));
MOCK_CONST_METHOD0(GetSendFrameCountObserver, FrameCountObserver*(void));
@ -205,6 +205,12 @@ class MockRtpRtcp : public RtpRtcp {
MOCK_METHOD1(SetVideoBitrateAllocation, void(const BitrateAllocation&));
// Members.
unsigned int remote_ssrc_;
private:
// Mocking this method is currently not required and having a default
// implementation like MOCK_METHOD0(TimeUntilNextProcess, int64_t())
// can be dangerous since it can cause a tight loop on a process thread.
virtual int64_t TimeUntilNextProcess() { return 0xffffffff; }
};
} // namespace webrtc