commit 1ed6224eafc7816f25d1906e4d709afdf2ad8f0f
author pbos@webrtc.org <pbos@webrtc.org> Thu Feb 19 13:57:03 2015 +0000
committer pbos@webrtc.org <pbos@webrtc.org> Thu Feb 19 13:57:43 2015 +0000
tree e90e53977bd4ee3e0e63981d55df00b306abcf2b
parent 287755246a403a7a6e686bc921f59894669e362c

Revert r8430 "Remove dead stats from Video{Sender,Receiver}Info."

This breaks compilation outside this codebase that needs to have it
removed before.

BUG=4322
TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/42009004

Cr-Commit-Position: refs/heads/master@{#8432}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8432 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/media/base/mediachannel.h

diff --git a/talk/media/base/mediachannel.h b/talk/media/base/mediachannel.h
index 8ba4950..19cb9a3 100644
--- a/talk/media/base/mediachannel.h
+++ b/talk/media/base/mediachannel.h
@@ -814,7 +814,8 @@
 
 struct VideoSenderInfo : public MediaSenderInfo {
   VideoSenderInfo()
-      : firs_rcvd(0),
+      : packets_cached(0),
+        firs_rcvd(0),
         plis_rcvd(0),
         nacks_rcvd(0),
         input_frame_width(0),
@@ -830,8 +831,11 @@
         capture_jitter_ms(0),
         avg_encode_ms(0),
         encode_usage_percent(0),
-        capture_queue_delay_ms_per_s(0) {}
+        capture_queue_delay_ms_per_s(0) {
+  }
 
+  std::vector<SsrcGroup> ssrc_groups;
+  int packets_cached;
   int firs_rcvd;
   int plis_rcvd;
   int nacks_rcvd;
@@ -856,7 +860,8 @@
 
 struct VideoReceiverInfo : public MediaReceiverInfo {
   VideoReceiverInfo()
-      : firs_sent(0),
+      : packets_concealed(0),
+        firs_sent(0),
         plis_sent(0),
         nacks_sent(0),
         frame_width(0),
@@ -864,6 +869,8 @@
         framerate_rcvd(0),
         framerate_decoded(0),
         framerate_output(0),
+        framerate_render_input(0),
+        framerate_render_output(0),
         decode_ms(0),
         max_decode_ms(0),
         jitter_buffer_ms(0),
@@ -871,8 +878,11 @@
         render_delay_ms(0),
         target_delay_ms(0),
         current_delay_ms(0),
-        capture_start_ntp_time_ms(-1) {}
+        capture_start_ntp_time_ms(-1) {
+  }
 
+  std::vector<SsrcGroup> ssrc_groups;
+  int packets_concealed;
   int firs_sent;
   int plis_sent;
   int nacks_sent;
@@ -881,6 +891,10 @@
   int framerate_rcvd;
   int framerate_decoded;
   int framerate_output;
+  // Framerate as sent to the renderer.
+  int framerate_render_input;
+  // Framerate that the renderer reports.
+  int framerate_render_output;
 
   // All stats below are gathered per-VideoReceiver, but some will be correlated
   // across MediaStreamTracks.  NOTE(hta): when sinking stats into per-SSRC