| Index: webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h
|
| 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 ceaa6373ff8fb9f03a910fe2ef9744b5dea5a893..3cdf4a902155437bc7041d1e3b354baafa7224c7 100644
|
| --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h
|
| +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h
|
| @@ -196,7 +196,7 @@ class Random {
|
| uint32_t a_;
|
| uint32_t b_;
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(Random);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Random);
|
| };
|
|
|
| bool IsTimeSorted(const Packets& packets);
|
| @@ -245,7 +245,7 @@ class PacketProcessor {
|
| PacketProcessorListener* listener_;
|
| const FlowIds flow_ids_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(PacketProcessor);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(PacketProcessor);
|
| };
|
|
|
| class RateCounterFilter : public PacketProcessor {
|
| @@ -278,7 +278,7 @@ class RateCounterFilter : public PacketProcessor {
|
| // Algorithm name if single flow, Total link utilization if all flows.
|
| std::string plot_name_;
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(RateCounterFilter);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RateCounterFilter);
|
| };
|
|
|
| class LossFilter : public PacketProcessor {
|
| @@ -294,7 +294,7 @@ class LossFilter : public PacketProcessor {
|
| Random random_;
|
| float loss_fraction_;
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(LossFilter);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LossFilter);
|
| };
|
|
|
| class DelayFilter : public PacketProcessor {
|
| @@ -310,7 +310,7 @@ class DelayFilter : public PacketProcessor {
|
| int64_t one_way_delay_us_;
|
| int64_t last_send_time_us_;
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(DelayFilter);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DelayFilter);
|
| };
|
|
|
| class JitterFilter : public PacketProcessor {
|
| @@ -330,7 +330,7 @@ class JitterFilter : public PacketProcessor {
|
| int64_t last_send_time_us_;
|
| bool reordering_; // False by default.
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(JitterFilter);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(JitterFilter);
|
| };
|
|
|
| // Reorders two consecutive packets with a probability of reorder_percent.
|
| @@ -347,7 +347,7 @@ class ReorderFilter : public PacketProcessor {
|
| Random random_;
|
| float reorder_fraction_;
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(ReorderFilter);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ReorderFilter);
|
| };
|
|
|
| // Apply a bitrate choke with an infinite queue on the packet stream.
|
| @@ -372,7 +372,7 @@ class ChokeFilter : public PacketProcessor {
|
| rtc::scoped_ptr<DelayCapHelper> delay_cap_helper_;
|
| int64_t max_delay_us_;
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(ChokeFilter);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(ChokeFilter);
|
| };
|
|
|
| class TraceBasedDeliveryFilter : public PacketProcessor {
|
| @@ -410,7 +410,7 @@ class TraceBasedDeliveryFilter : public PacketProcessor {
|
| Stats<double> packets_per_second_stats_;
|
| Stats<double> kbps_stats_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(TraceBasedDeliveryFilter);
|
| + RTC_DISALLOW_COPY_AND_ASSIGN(TraceBasedDeliveryFilter);
|
| };
|
|
|
| class VideoSource {
|
| @@ -450,7 +450,7 @@ class VideoSource {
|
| int64_t start_plotting_ms_;
|
| uint32_t previous_bitrate_bps_;
|
|
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(VideoSource);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VideoSource);
|
| };
|
|
|
| class AdaptiveVideoSource : public VideoSource {
|
| @@ -465,7 +465,7 @@ class AdaptiveVideoSource : public VideoSource {
|
| void SetBitrateBps(int bitrate_bps) override;
|
|
|
| private:
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveVideoSource);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AdaptiveVideoSource);
|
| };
|
|
|
| class PeriodicKeyFrameSource : public AdaptiveVideoSource {
|
| @@ -488,7 +488,7 @@ class PeriodicKeyFrameSource : public AdaptiveVideoSource {
|
| uint32_t frame_counter_;
|
| int compensation_bytes_;
|
| int compensation_per_frame_;
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(PeriodicKeyFrameSource);
|
| + RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PeriodicKeyFrameSource);
|
| };
|
| } // namespace bwe
|
| } // namespace testing
|
|
|