aboutsummaryrefslogtreecommitdiff
path: root/webrtc/voice_engine/test/auto_test
diff options
context:
space:
mode:
authorStefan Holmer <holmer@google.com>2015-03-26 11:11:06 +0100
committerStefan Holmer <holmer@google.com>2015-03-26 10:11:22 +0000
commite59041672283a28bde0b043c0c2bc198272f82e1 (patch)
tree0d93ccfbe2a5748220d24c99dd79b46abfa34c53 /webrtc/voice_engine/test/auto_test
parent5225dd818047a06fe2f2a246db0fd18bb4deef5b (diff)
downloadwebrtc-e59041672283a28bde0b043c0c2bc198272f82e1.tar.gz
Moving the pacer and the pacer thread to ChannelGroup.
This means all channels within the same group will share the same pacing queue and scheduler. It also means padding will be computed and sent by a single pacer. To accomplish this I also introduce a PacketRouter which finds the RTP module which owns the packet to be paced out. BUG=4323 R=mflodman@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/45549004 Cr-Commit-Position: refs/heads/master@{#8864}
Diffstat (limited to 'webrtc/voice_engine/test/auto_test')
-rw-r--r--webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc
index bde16220e9..18f064eb77 100644
--- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_extensions.cc
@@ -159,6 +159,7 @@ class MockViENetwork : public webrtc::ViENetwork {
virtual ~MockViENetwork() {}
MOCK_METHOD0(Release, int());
+ MOCK_METHOD4(SetBitrateConfig, void(int, int, int, int));
MOCK_METHOD2(SetNetworkTransmissionState, void(const int, const bool));
MOCK_METHOD2(RegisterSendTransport, int(const int, webrtc::Transport&));
MOCK_METHOD1(DeregisterSendTransport, int(const int));