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

De-flake VideoSendStreamTest.ReconfigureBitratesSetsEncoderBitratesCorrectly

Browse Source 
BUG=webrtc:5382
R=pbos@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1922483002 .

Cr-Commit-Position: refs/heads/master@{#12547}
This commit is contained in:
philipel
2016-04-28 15:52:49 +02:00
parent 6b470a9413
commit c6957c7b73
8 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/bitrate_controller/include/bitrate_controller.h
View File

@ -54,8 +54,13 @@ class BitrateController : public Module {
virtual RtcpBandwidthObserver* CreateRtcpBandwidthObserver() = 0;
// Deprecated
virtual void SetStartBitrate(int start_bitrate_bps) = 0;
// Deprecated
virtual void SetMinMaxBitrate(int min_bitrate_bps, int max_bitrate_bps) = 0;
virtual void SetBitrates(int start_bitrate_bps,
int min_bitrate_bps,
int max_bitrate_bps) = 0;
virtual void UpdateDelayBasedEstimate(uint32_t bitrate_bps) = 0;

4
webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h
View File

@ -31,6 +31,10 @@ class MockBitrateController : public BitrateController {
MOCK_METHOD1(SetStartBitrate, void(int start_bitrate_bps));
MOCK_METHOD2(SetMinMaxBitrate,
void(int min_bitrate_bps, int max_bitrate_bps));
MOCK_METHOD3(SetBitrates,
void(int start_bitrate_bps,
int min_bitrate_bps,
int max_bitrate_bps));
MOCK_METHOD1(UpdateDelayBasedEstimate, void(uint32_t bitrate_bps));
MOCK_METHOD1(SetEventLog, void(RtcEventLog* event_log));
MOCK_CONST_METHOD1(AvailableBandwidth, bool(uint32_t* bandwidth));