Make variable for selecting if intervals without samples should be included in stats configurable (…

webrtc/video/stats_counter_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 152 matching lines @@
   EXPECT_EQ(500, observer->last_sample_);
   // Aggregated stats.
   AggregatedStats stats = counter.GetStats();
   EXPECT_EQ(1, stats.num_samples);
   EXPECT_EQ(500, stats.min);
   EXPECT_EQ(500, stats.max);
 }
 
 TEST_F(StatsCounterTest, TestMetric_RateCounter) {
   StatsCounterObserverImpl* observer = new StatsCounterObserverImpl();
-  RateCounter counter(&clock_, observer);
+  RateCounter counter(&clock_, observer, true);
   counter.Add(186);
   counter.Add(350);
   counter.Add(22);
   clock_.AdvanceTimeMilliseconds(kProcessIntervalMs);
   // Trigger process (sample included in next interval).
   counter.Add(111);
   // Rate per interval, (186 + 350 + 22) / 2 sec = 279 samples/sec
   EXPECT_EQ(1, observer->num_calls_);
   EXPECT_EQ(279, observer->last_sample_);
   // Aggregated stats.
   AggregatedStats stats = counter.GetStats();
   EXPECT_EQ(1, stats.num_samples);
   EXPECT_EQ(279, stats.min);
   EXPECT_EQ(279, stats.max);
 }
 
 TEST_F(StatsCounterTest, TestMetric_RateAccCounter) {
   StatsCounterObserverImpl* observer = new StatsCounterObserverImpl();
-  RateAccCounter counter(&clock_, observer);
+  RateAccCounter counter(&clock_, observer, true);
   counter.Set(175);
   counter.Set(188);
   clock_.AdvanceTimeMilliseconds(kProcessIntervalMs);
   // Trigger process (sample included in next interval).
   counter.Set(192);
   // Rate per interval: (188 - 0) / 2 sec = 94 samples/sec
   EXPECT_EQ(1, observer->num_calls_);
   EXPECT_EQ(94, observer->last_sample_);
   // Aggregated stats.
   AggregatedStats stats = counter.GetStats();
@@ skipping 42 matching lines @@
   EXPECT_EQ(kSample1, stats.min);
   EXPECT_EQ(kSample2, stats.max);
   EXPECT_EQ(6, stats.average);
 }
 
 TEST_F(StatsCounterTest, TestRateAccCounter_NegativeRateIgnored) {
   StatsCounterObserverImpl* observer = new StatsCounterObserverImpl();
   const int kSample1 = 200;  //  200 / 2 sec
   const int kSample2 = 100;  // -100 / 2 sec - negative ignored
   const int kSample3 = 700;  //  600 / 2 sec
-  RateAccCounter counter(&clock_, observer);
+  RateAccCounter counter(&clock_, observer, true);
   SetSampleAndAdvance(kSample1, kProcessIntervalMs, &counter);
   SetSampleAndAdvance(kSample2, kProcessIntervalMs, &counter);
   SetSampleAndAdvance(kSample3, kProcessIntervalMs, &counter);
   EXPECT_EQ(1, observer->num_calls_);
   EXPECT_EQ(100, observer->last_sample_);
   // Trigger process (sample included in next interval).
   counter.Set(2000);
   EXPECT_EQ(2, observer->num_calls_);
   EXPECT_EQ(300, observer->last_sample_);
   // Aggregated stats.
@@ skipping 19 matching lines @@
   // [6:1],[8:1]
   EXPECT_EQ(2, observer->num_calls_);
   EXPECT_EQ(8, observer->last_sample_);
   // Aggregated stats.
   AggregatedStats stats = counter.GetStats();
   EXPECT_EQ(2, stats.num_samples);
   EXPECT_EQ(6, stats.min);
   EXPECT_EQ(8, stats.max);
 }
 
-TEST_F(StatsCounterTest, TestRateCounter_IntervalsWithoutSamplesIncluded) {
+TEST_F(StatsCounterTest, TestRateCounter_IntervalsWithoutSamplesIgnored) {
+  const bool kIncludeEmptyIntervals = false;
   StatsCounterObserverImpl* observer = new StatsCounterObserverImpl();
   const int kSample1 = 50;  //  50 / 2 sec
   const int kSample2 = 20;  //  20 / 2 sec
-  RateCounter counter(&clock_, observer);
+  RateCounter counter(&clock_, observer, kIncludeEmptyIntervals);
   counter.Add(kSample1);
   clock_.AdvanceTimeMilliseconds(kProcessIntervalMs * 3 - 1);
   // Trigger process (sample included in next interval).
+  counter.Add(kSample2);
+  // [25:1],  one interval without samples passed.
+  EXPECT_EQ(1, observer->num_calls_);
+  EXPECT_EQ(25, observer->last_sample_);
+  // Make last interval pass.
+  clock_.AdvanceTimeMilliseconds(1);
+  counter.Add(111);  // Trigger process (sample included in next interval).
+  // [10:1],[25:1]
+  EXPECT_EQ(2, observer->num_calls_);
+  EXPECT_EQ(10, observer->last_sample_);
+  // Aggregated stats.
+  AggregatedStats stats = counter.GetStats();
+  EXPECT_EQ(2, stats.num_samples);
+  EXPECT_EQ(10, stats.min);
+  EXPECT_EQ(25, stats.max);
+}
+
+TEST_F(StatsCounterTest, TestRateCounter_IntervalsWithoutSamplesIncluded) {
+  const bool kIncludeEmptyIntervals = true;
+  StatsCounterObserverImpl* observer = new StatsCounterObserverImpl();
+  const int kSample1 = 50;  //  50 / 2 sec
+  const int kSample2 = 20;  //  20 / 2 sec
+  RateCounter counter(&clock_, observer, kIncludeEmptyIntervals);
+  counter.Add(kSample1);
+  clock_.AdvanceTimeMilliseconds(kProcessIntervalMs * 3 - 1);
+  // Trigger process (sample included in next interval).
   counter.Add(kSample2);
   // [0:1],[25:1],  one interval without samples passed.
   EXPECT_EQ(2, observer->num_calls_);
   EXPECT_EQ(25, observer->last_sample_);
   // Make last interval pass.
   clock_.AdvanceTimeMilliseconds(1);
   counter.Add(111);  // Trigger process (sample included in next interval).
   // [0:1],[10:1],[25:1]
   EXPECT_EQ(3, observer->num_calls_);
   EXPECT_EQ(10, observer->last_sample_);
   // Aggregated stats.
   AggregatedStats stats = counter.GetStats();
   EXPECT_EQ(3, stats.num_samples);
   EXPECT_EQ(0, stats.min);
   EXPECT_EQ(25, stats.max);
 }
 
 }  // namespace webrtc