Add ability to handle data from multiple streams in RateAccCounter.

webrtc/video/stats_counter.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_VIDEO_STATS_COUNTER_H_
 #define WEBRTC_VIDEO_STATS_COUNTER_H_
 
 #include <memory>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 class AggregatedCounter;
 class Clock;
+class Samples;
 
 // |StatsCounterObserver| is called periodically when a metric is updated.
 class StatsCounterObserver {
  public:
   virtual void OnMetricUpdated(int sample) = 0;
 
   virtual ~StatsCounterObserver() {}
 };
 
 struct AggregatedStats {
@@ skipping 64 matching lines @@
   // Checks if a sample has been added (i.e. Add or Set called).
   bool HasSample() const;
 
  protected:
   StatsCounter(Clock* clock,
                int64_t process_intervals_ms,
                bool include_empty_intervals,
                StatsCounterObserver* observer);
 
   void Add(int sample);
-  void Set(int sample);
+  void Set(int sample, uint32_t stream_id);
 
-  int max_;
-  int64_t sum_;
-  int64_t num_samples_;
-  int64_t last_sum_;
-
+  const bool include_empty_intervals_;
+  const int64_t process_intervals_ms_;
   const std::unique_ptr<AggregatedCounter> aggregated_counter_;
-  const int64_t process_intervals_ms_;
+  const std::unique_ptr<Samples> samples_;
 
  private:
   bool TimeToProcess(int* num_elapsed_intervals);
   void TryProcess();
   void ReportMetricToAggregatedCounter(int value, int num_values_to_add) const;
   bool IncludeEmptyIntervals() const;
 
   Clock* const clock_;
-  const bool include_empty_intervals_;
   const std::unique_ptr<StatsCounterObserver> observer_;
   int64_t last_process_time_ms_;
   bool paused_;
 };
 
 // AvgCounter: average of samples
 //
 //           | *      *      *      | *           *       | ...
 //           | Add(5) Add(1) Add(6) | Add(5)      Add(5)  |
 // GetMetric | (5 + 1 + 6) / 3      | (5 + 5) / 2         |
@@ skipping 120 matching lines @@
 //                            in the stats. The value for an interval is
 //                            determined by GetValueForEmptyInterval().
 //
 class RateAccCounter : public StatsCounter {
  public:
   RateAccCounter(Clock* clock,
                  StatsCounterObserver* observer,
                  bool include_empty_intervals);
   ~RateAccCounter() override {}
 
-  void Set(int sample);
+  void Set(int sample, uint32_t stream_id);
 
  private:
   bool GetMetric(int* metric) const override;
   int GetValueForEmptyInterval() const override;  // Returns zero.
 
   RTC_DISALLOW_COPY_AND_ASSIGN(RateAccCounter);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_STATS_COUNTER_H_