commit cfd82dfc1156f6610388bec0ebbdeacaf47e9719
author asapersson@webrtc.org <asapersson@webrtc.org> Thu Jan 22 09:39:59 2015
committer asapersson@webrtc.org <asapersson@webrtc.org> Thu Jan 22 09:39:59 2015
tree 701d78f804e5133deb1465756bedd247ba779346
parent 3dd33a6787d15951fb51dda8443595d542ca560e

Split packets/bytes in StreamDataCounter into RtpPacketCounter struct.
Prepares for adding FEC bytes to the StreamDataCounter.

R=mflodman@webrtc.org, stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8122 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 2792273..bfc8266 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -408,8 +408,10 @@
   RTCPSender::FeedbackState state;
   state.send_payload_type = SendPayloadType();
   state.frequency_hz = CurrentSendFrequencyHz();
-  state.packets_sent = rtp_stats.packets + rtx_stats.packets;
-  state.media_bytes_sent = rtp_stats.bytes + rtx_stats.bytes;
+  state.packets_sent = rtp_stats.transmitted.packets +
+                       rtx_stats.transmitted.packets;
+  state.media_bytes_sent = rtp_stats.transmitted.payload_bytes +
+                           rtx_stats.transmitted.payload_bytes;
   state.module = this;
 
   LastReceivedNTP(&state.last_rr_ntp_secs,
@@ -798,12 +800,16 @@
   rtp_sender_.GetDataCounters(&rtp_stats, &rtx_stats);
 
   if (bytes_sent) {
-    *bytes_sent = rtp_stats.bytes + rtp_stats.padding_bytes +
-                  rtp_stats.header_bytes + rtx_stats.bytes +
-                  rtx_stats.padding_bytes + rtx_stats.header_bytes;
+    *bytes_sent = rtp_stats.transmitted.payload_bytes +
+                  rtp_stats.transmitted.padding_bytes +
+                  rtp_stats.transmitted.header_bytes +
+                  rtx_stats.transmitted.payload_bytes +
+                  rtx_stats.transmitted.padding_bytes +
+                  rtx_stats.transmitted.header_bytes;
   }
   if (packets_sent) {
-    *packets_sent = rtp_stats.packets + rtx_stats.packets;
+    *packets_sent = rtp_stats.transmitted.packets +
+                    rtx_stats.transmitted.packets;
   }
   return 0;
 }