Add ability to handle data from multiple streams in RateAccCounter.

webrtc/video/stats_counter_unittest.cc

Index: webrtc/video/stats_counter_unittest.cc
diff --git a/webrtc/video/stats_counter_unittest.cc b/webrtc/video/stats_counter_unittest.cc
index 5dd8b72cd6ebc2859bdc5221ca0fbdd73df788fa..e3c3778f66a1b8baaa9435144e6aa4fb3fa7b619 100644
--- a/webrtc/video/stats_counter_unittest.cc
+++ b/webrtc/video/stats_counter_unittest.cc
@@ -17,6 +17,7 @@
 namespace webrtc {
 namespace {
 const int kProcessIntervalMs = 2000;
+const int kSsrc = 123456;
 
 class StatsCounterObserverImpl : public StatsCounterObserver {
  public:
@@ -43,7 +44,7 @@ class StatsCounterTest : public ::testing::Test {
   void SetSampleAndAdvance(int sample,
                            int interval_ms,
                            RateAccCounter* counter) {
-    counter->Set(sample);
+    counter->Set(sample, kSsrc);
     clock_.AdvanceTimeMilliseconds(interval_ms);
   }
 
@@ -190,11 +191,11 @@ TEST_F(StatsCounterTest, TestMetric_RateCounter) {
 TEST_F(StatsCounterTest, TestMetric_RateAccCounter) {
   StatsCounterObserverImpl* observer = new StatsCounterObserverImpl();
   RateAccCounter counter(&clock_, observer, true);
-  counter.Set(175);
-  counter.Set(188);
+  counter.Set(175, kSsrc);
+  counter.Set(188, kSsrc);
   clock_.AdvanceTimeMilliseconds(kProcessIntervalMs);
   // Trigger process (sample included in next interval).
-  counter.Set(192);
+  counter.Set(192, kSsrc);
   // Rate per interval: (188 - 0) / 2 sec = 94 samples/sec
   EXPECT_EQ(1, observer->num_calls_);
   EXPECT_EQ(94, observer->last_sample_);
@@ -205,6 +206,37 @@ TEST_F(StatsCounterTest, TestMetric_RateAccCounter) {
   EXPECT_EQ(94, stats.max);
 }
 
+TEST_F(StatsCounterTest, TestMetric_RateAccCounterWithMultipleSsrcs) {
+  StatsCounterObserverImpl* observer = new StatsCounterObserverImpl();
+  RateAccCounter counter(&clock_, observer, true);
+  counter.Set(175, kSsrc);
+  counter.Set(188, kSsrc);
+  counter.Set(100, kSsrc + 1);
+  clock_.AdvanceTimeMilliseconds(kProcessIntervalMs);
+  // Trigger process (sample included in next interval).
+  counter.Set(150, kSsrc + 1);
+  // Rate per interval: ((188 - 0) + (100 - 0)) / 2 sec = 144 samples/sec
+  EXPECT_EQ(1, observer->num_calls_);
+  EXPECT_EQ(144, observer->last_sample_);
+  clock_.AdvanceTimeMilliseconds(kProcessIntervalMs);
+  // Trigger process (sample included in next interval).
+  counter.Set(198, kSsrc);
+  // Rate per interval: (0 + (150 - 100)) / 2 sec = 25 samples/sec
+  EXPECT_EQ(2, observer->num_calls_);
+  EXPECT_EQ(25, observer->last_sample_);
+  clock_.AdvanceTimeMilliseconds(kProcessIntervalMs);
+  // Trigger process (sample included in next interval).
+  counter.Set(200, kSsrc);
+  // Rate per interval: ((198 - 188) + (0)) / 2 sec = 5 samples/sec
+  EXPECT_EQ(3, observer->num_calls_);
+  EXPECT_EQ(5, observer->last_sample_);
+  // Aggregated stats.
+  AggregatedStats stats = counter.GetStats();
+  EXPECT_EQ(3, stats.num_samples);
+  EXPECT_EQ(5, stats.min);
+  EXPECT_EQ(144, stats.max);
+}
+
 TEST_F(StatsCounterTest, TestGetStats_MultipleIntervals) {
   AvgCounter counter(&clock_, nullptr);
   const int kSample1 = 1;
@@ -259,7 +291,7 @@ TEST_F(StatsCounterTest, TestRateAccCounter_NegativeRateIgnored) {
   EXPECT_EQ(1, observer->num_calls_);
   EXPECT_EQ(100, observer->last_sample_);
   // Trigger process (sample included in next interval).
-  counter.Set(2000);
+  counter.Set(2000, kSsrc);
   EXPECT_EQ(2, observer->num_calls_);
   EXPECT_EQ(300, observer->last_sample_);
   // Aggregated stats.