diff options
Diffstat (limited to 'webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h')
-rw-r--r-- | webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h index 6b24cf30a6..3bb9b95f4b 100644 --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h @@ -17,21 +17,23 @@ #include <algorithm> #include <list> #include <numeric> +#include <set> #include <sstream> #include <string> +#include <utility> #include <vector> #include "webrtc/base/common.h" +#include "webrtc/base/random.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" -#include "webrtc/modules/interface/module_common_types.h" -#include "webrtc/modules/pacing/include/paced_sender.h" +#include "webrtc/modules/include/module_common_types.h" +#include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" #include "webrtc/modules/remote_bitrate_estimator/test/packet.h" -#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" +#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "webrtc/system_wrappers/include/clock.h" -#include "webrtc/test/random.h" namespace webrtc { @@ -44,7 +46,7 @@ class DelayCapHelper; class RateCounter { public: - RateCounter(int64_t window_size_ms) + explicit RateCounter(int64_t window_size_ms) : window_size_us_(1000 * window_size_ms), recently_received_packets_(0), recently_received_bytes_(0), @@ -265,7 +267,7 @@ class LossFilter : public PacketProcessor { virtual void RunFor(int64_t time_ms, Packets* in_out); private: - test::Random random_; + Random random_; float loss_fraction_; RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LossFilter); @@ -299,7 +301,7 @@ class JitterFilter : public PacketProcessor { int64_t MeanUs(); private: - test::Random random_; + Random random_; int64_t stddev_jitter_us_; int64_t last_send_time_us_; bool reordering_; // False by default. @@ -318,7 +320,7 @@ class ReorderFilter : public PacketProcessor { virtual void RunFor(int64_t time_ms, Packets* in_out); private: - test::Random random_; + Random random_; float reorder_fraction_; RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ReorderFilter); @@ -415,6 +417,7 @@ class VideoSource { uint32_t frame_size_bytes_; private: + Random random_; const int flow_id_; int64_t next_frame_ms_; int64_t next_frame_rand_ms_; |