commit | 5ee713944ef2e7ebab922e51b1de74dcb2463384 | [log] [tgz] |
---|---|---|
author | stefan@webrtc.org <stefan@webrtc.org> | Fri Sep 06 13:58:01 2013 +0000 |
committer | stefan@webrtc.org <stefan@webrtc.org> | Fri Sep 06 13:58:01 2013 +0000 |
tree | 86d68e785f552b3474bda51d7dc8f46b0d9ea8ea | |
parent | 5632a64569883b565bc744182cf719f3f0268d41 [diff] [blame] |
Improving padding rules and breaking out bw allocation to ViEEncoder. BUG=1837 TESTS=vie_auto_test --automated, trybots R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2170004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4693 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 2b6bedc..608fe35 100644 --- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h +++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -218,7 +218,7 @@ MOCK_METHOD1(SetCameraDelay, int32_t(const int32_t delayMS)); MOCK_METHOD1(SetTargetSendBitrate, - void(const uint32_t bitrate)); + void(const std::vector<uint32_t>& stream_bitrates)); MOCK_METHOD3(SetGenericFECStatus, int32_t(const bool enable, const uint8_t payloadTypeRED, const uint8_t payloadTypeFEC)); MOCK_METHOD3(GenericFECStatus,