Renamed fields in common_types.h/RtcpStatistics.

webrtc/video/receive_statistics_proxy_unittest.cc

 /*
  *  Copyright 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.
  */
 
@@ skipping 227 matching lines @@
 }
 
 TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsRtcpStats) {
   const uint8_t kFracLost = 0;
   const uint32_t kCumLost = 1;
   const uint32_t kExtSeqNum = 10;
   const uint32_t kJitter = 4;
 
   RtcpStatistics rtcp_stats;
   rtcp_stats.fraction_lost = kFracLost;
-  rtcp_stats.cumulative_lost = kCumLost;
-  rtcp_stats.extended_max_sequence_number = kExtSeqNum;
+  rtcp_stats.packets_lost = kCumLost;
+  rtcp_stats.extended_highest_sequence_number = kExtSeqNum;
   rtcp_stats.jitter = kJitter;
   statistics_proxy_->StatisticsUpdated(rtcp_stats, kRemoteSsrc);
 
   VideoReceiveStream::Stats stats = statistics_proxy_->GetStats();
   EXPECT_EQ(kFracLost, stats.rtcp_stats.fraction_lost);
-  EXPECT_EQ(kCumLost, stats.rtcp_stats.cumulative_lost);
-  EXPECT_EQ(kExtSeqNum, stats.rtcp_stats.extended_max_sequence_number);
+  EXPECT_EQ(kCumLost, stats.rtcp_stats.packets_lost);
+  EXPECT_EQ(kExtSeqNum, stats.rtcp_stats.extended_highest_sequence_number);
   EXPECT_EQ(kJitter, stats.rtcp_stats.jitter);
 }
 
 TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsCName) {
   const char* kName = "cName";
   statistics_proxy_->CNameChanged(kName, kRemoteSsrc);
   EXPECT_STREQ(kName, statistics_proxy_->GetStats().c_name.c_str());
 }
 
 TEST_F(ReceiveStatisticsProxyTest, GetStatsReportsNoCNameForUnknownSsrc) {
@@ skipping 85 matching lines @@
 }
 
 TEST_F(ReceiveStatisticsProxyTest, PacketLossHistogramIsUpdated) {
   const uint32_t kCumLost1 = 1;
   const uint32_t kExtSeqNum1 = 10;
   const uint32_t kCumLost2 = 2;
   const uint32_t kExtSeqNum2 = 20;
 
   // One report block received.
   RtcpStatistics rtcp_stats1;
-  rtcp_stats1.cumulative_lost = kCumLost1;
-  rtcp_stats1.extended_max_sequence_number = kExtSeqNum1;
+  rtcp_stats1.packets_lost = kCumLost1;
+  rtcp_stats1.extended_highest_sequence_number = kExtSeqNum1;
   statistics_proxy_->StatisticsUpdated(rtcp_stats1, kRemoteSsrc);
 
   // Two report blocks received.
   RtcpStatistics rtcp_stats2;
-  rtcp_stats2.cumulative_lost = kCumLost2;
-  rtcp_stats2.extended_max_sequence_number = kExtSeqNum2;
+  rtcp_stats2.packets_lost = kCumLost2;
+  rtcp_stats2.extended_highest_sequence_number = kExtSeqNum2;
   statistics_proxy_->StatisticsUpdated(rtcp_stats2, kRemoteSsrc);
 
   // Two received report blocks but min run time has not passed.
   fake_clock_.AdvanceTimeMilliseconds(metrics::kMinRunTimeInSeconds * 1000 - 1);
   SetUp();  // Reset stat proxy causes histograms to be updated.
   EXPECT_EQ(0,
             metrics::NumSamples("WebRTC.Video.ReceivedPacketsLostInPercent"));
 
   // Two report blocks received.
   statistics_proxy_->StatisticsUpdated(rtcp_stats1, kRemoteSsrc);
   statistics_proxy_->StatisticsUpdated(rtcp_stats2, kRemoteSsrc);
 
   // Two received report blocks and min run time has passed.
   fake_clock_.AdvanceTimeMilliseconds(metrics::kMinRunTimeInSeconds * 1000);
   SetUp();
   EXPECT_EQ(1,
             metrics::NumSamples("WebRTC.Video.ReceivedPacketsLostInPercent"));
   EXPECT_EQ(1, metrics::NumEvents("WebRTC.Video.ReceivedPacketsLostInPercent",
                                   (kCumLost2 - kCumLost1) * 100 /
                                       (kExtSeqNum2 - kExtSeqNum1)));
 }
 
 TEST_F(ReceiveStatisticsProxyTest,
        PacketLossHistogramIsNotUpdatedIfLessThanTwoReportBlocksAreReceived) {
   RtcpStatistics rtcp_stats1;
-  rtcp_stats1.cumulative_lost = 1;
-  rtcp_stats1.extended_max_sequence_number = 10;
+  rtcp_stats1.packets_lost = 1;
+  rtcp_stats1.extended_highest_sequence_number = 10;
 
   // Min run time has passed but no received report block.
   fake_clock_.AdvanceTimeMilliseconds(metrics::kMinRunTimeInSeconds * 1000);
   SetUp();  // Reset stat proxy causes histograms to be updated.
   EXPECT_EQ(0,
             metrics::NumSamples("WebRTC.Video.ReceivedPacketsLostInPercent"));
 
   // Min run time has passed but only one received report block.
   statistics_proxy_->StatisticsUpdated(rtcp_stats1, kRemoteSsrc);
   fake_clock_.AdvanceTimeMilliseconds(metrics::kMinRunTimeInSeconds * 1000);
@@ skipping 305 matching lines @@
                             kFirPackets * 60 / metrics::kMinRunTimeInSeconds));
   EXPECT_EQ(
       1, metrics::NumEvents("WebRTC.Video.PliPacketsSentPerMinute",
                             kPliPackets * 60 / metrics::kMinRunTimeInSeconds));
   EXPECT_EQ(
       1, metrics::NumEvents("WebRTC.Video.NackPacketsSentPerMinute",
                             kNackPackets * 60 / metrics::kMinRunTimeInSeconds));
 }
 
 }  // namespace webrtc