Add resolution and fps stats to histograms.

webrtc/video/receive_statistics_proxy.h

 /*
  *  Copyright (c) 2013 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_RECEIVE_STATISTICS_PROXY_H_
 #define WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_
 
 #include <string>
 
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/ratetracker.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/frame_callback.h"
 #include "webrtc/modules/remote_bitrate_estimator/rate_statistics.h"
 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
 #include "webrtc/video_engine/report_block_stats.h"
 #include "webrtc/video_engine/vie_channel.h"
 #include "webrtc/video_receive_stream.h"
 #include "webrtc/video_renderer.h"
 
 namespace webrtc {
 
 class Clock;
 class ViECodec;
 class ViEDecoderObserver;
 
 class ReceiveStatisticsProxy : public ViEDecoderObserver,
                                public VCMReceiveStatisticsCallback,
                                public RtcpStatisticsCallback,
                                public RtcpPacketTypeCounterObserver,
                                public StreamDataCountersCallback {
  public:
   ReceiveStatisticsProxy(uint32_t ssrc, Clock* clock);
   virtual ~ReceiveStatisticsProxy();
 
   VideoReceiveStream::Stats GetStats() const;
 
   void OnDecodedFrame();
-  void OnRenderedFrame();
+  void OnRenderedFrame(int width, int height);
 
-  // Overrides VCMReceiveStatisticsCallback
+  // Overrides VCMReceiveStatisticsCallback.
   void OnReceiveRatesUpdated(uint32_t bitRate, uint32_t frameRate) override;
   void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
   void OnDiscardedPacketsUpdated(int discarded_packets) override;
 
   // Overrides ViEDecoderObserver.
   void IncomingCodecChanged(const int video_channel,
                             const VideoCodec& video_codec) override {}
   void IncomingRate(const int video_channel,
                     const unsigned int framerate,
                     const unsigned int bitrate_bps) override;
   void DecoderTiming(int decode_ms,
                      int max_decode_ms,
                      int current_delay_ms,
                      int target_delay_ms,
                      int jitter_buffer_ms,
                      int min_playout_delay_ms,
                      int render_delay_ms) override;
 
   // Overrides RtcpStatisticsCallback.
   void StatisticsUpdated(const webrtc::RtcpStatistics& statistics,
                          uint32_t ssrc) override;
   void CNameChanged(const char* cname, uint32_t ssrc) override;
 
-  // Overrides RtcpPacketTypeCounterObserver
+  // Overrides RtcpPacketTypeCounterObserver.
   void RtcpPacketTypesCounterUpdated(
       uint32_t ssrc,
       const RtcpPacketTypeCounter& packet_counter) override;
   // Overrides StreamDataCountersCallback.
   void DataCountersUpdated(const webrtc::StreamDataCounters& counters,
                            uint32_t ssrc) override;
 
  private:
-  void UpdateHistograms() const;
+  struct SampleCounter {
+    SampleCounter() : sum(0), num(0) {}
+    void Add(int sample) {

[pbos-webrtc, 2015/07/20 13:52:22]

Move implementation-parts to .cc file.

[åsapersson, 2015/07/20 15:06:30]

Done.

+      sum += sample;
+      ++num;
+    }
+    int Avg(int min_required_samples) const {
+      if (num < min_required_samples || num == 0) return -1;
+      return sum / num;
+    }
+   private:

[pbos-webrtc, 2015/07/20 13:52:22]

run git cl format

[åsapersson, 2015/07/20 15:06:30]

Done.

+    int sum;
+    int num;

[pbos-webrtc, 2015/07/20 15:11:07]

rename num -> num_samples

[åsapersson, 2015/07/21 06:05:46]

Done.

+  };
+
+  void UpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_);
   Clock* const clock_;

[pbos-webrtc, 2015/07/20 13:52:22]

newline before, consider moving clock_ down to the rest

[åsapersson, 2015/07/20 15:06:30]

Done.

 
   mutable rtc::CriticalSection crit_;
   VideoReceiveStream::Stats stats_ GUARDED_BY(crit_);
   RateStatistics decode_fps_estimator_ GUARDED_BY(crit_);
   RateStatistics renders_fps_estimator_ GUARDED_BY(crit_);
+  rtc::RateTracker render_fps_tracker_total_ GUARDED_BY(crit_);
+  SampleCounter render_width_counter_ GUARDED_BY(crit_);
+  SampleCounter render_height_counter_ GUARDED_BY(crit_);
   ReportBlockStats report_block_stats_ GUARDED_BY(crit_);
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_