commit 186d9c38733a5e4151be7df55a1220a8c47c8bf4
author srte <srte@webrtc.org> Fri Aug 04 05:03:53 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Fri Aug 04 12:03:53 2017 +0000
tree 7a2594d8dae61d938a4399709acb193897f5e627
parent 463d7ccb36c130274c75b8f164615acaa3baeec7

Renamed fields in common_types.h/RtcpStatistics.

BUG=webrtc:8033

Review-Url: https://codereview.webrtc.org/2992043002
Cr-Commit-Position: refs/heads/master@{#19247}

webrtc/modules/audio_coding/neteq/neteq_unittest.cc

diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc
index 66f6537..31fb74e 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc
@@ -92,9 +92,9 @@
 void Convert(const webrtc::RtcpStatistics& stats_raw,
              webrtc::neteq_unittest::RtcpStatistics* stats) {
   stats->set_fraction_lost(stats_raw.fraction_lost);
-  stats->set_cumulative_lost(stats_raw.cumulative_lost);
+  stats->set_cumulative_lost(stats_raw.packets_lost);
   stats->set_extended_max_sequence_number(
-      stats_raw.extended_max_sequence_number);
+      stats_raw.extended_highest_sequence_number);
   stats->set_jitter(stats_raw.jitter);
 }
 

webrtc/modules/audio_coding/neteq/rtcp.cc

diff --git a/webrtc/modules/audio_coding/neteq/rtcp.cc b/webrtc/modules/audio_coding/neteq/rtcp.cc
index 0263e76..3f8ef0e 100644
--- a/webrtc/modules/audio_coding/neteq/rtcp.cc
+++ b/webrtc/modules/audio_coding/neteq/rtcp.cc
@@ -56,24 +56,24 @@
 
 void Rtcp::GetStatistics(bool no_reset, RtcpStatistics* stats) {
   // Extended highest sequence number received.
-  stats->extended_max_sequence_number =
+  stats->extended_highest_sequence_number =
       (static_cast<int>(cycles_) << 16) + max_seq_no_;
 
   // Calculate expected number of packets and compare it with the number of
   // packets that were actually received. The cumulative number of lost packets
   // can be extracted.
   uint32_t expected_packets =
-      stats->extended_max_sequence_number - base_seq_no_ + 1;
+      stats->extended_highest_sequence_number - base_seq_no_ + 1;
   if (received_packets_ == 0) {
     // No packets received, assume none lost.
-    stats->cumulative_lost = 0;
+    stats->packets_lost = 0;
   } else if (expected_packets > received_packets_) {
-    stats->cumulative_lost = expected_packets - received_packets_;
-    if (stats->cumulative_lost > 0xFFFFFF) {
-      stats->cumulative_lost = 0xFFFFFF;
+    stats->packets_lost = expected_packets - received_packets_;
+    if (stats->packets_lost > 0xFFFFFF) {
+      stats->packets_lost = 0xFFFFFF;
     }
   } else {
-    stats->cumulative_lost = 0;
+    stats->packets_lost = 0;
   }
 
   // Fraction lost since last report.