Fix bug in ramp-up tests stats where rtx was accounted for in the media ssrc.

webrtc/video/rampup_tests.cc

 /*
  *  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.
  */
 
@@ skipping 192 matching lines @@
 
 void RampUpTester::ReportResult(const std::string& measurement,
                                 size_t value,
                                 const std::string& units) const {
   webrtc::test::PrintResult(
       measurement, "",
       ::testing::UnitTest::GetInstance()->current_test_info()->name(),
       value, units, false);
 }
 
-void RampUpTester::GetStats(const VideoSendStream::StreamStats& stream,
-                            size_t* total_packets_sent,
-                            size_t* total_sent,
-                            size_t* padding_sent,
-                            size_t* media_sent) const {
+void RampUpTester::AccumulateStats(const VideoSendStream::StreamStats& stream,
+                                   size_t* total_packets_sent,
+                                   size_t* total_sent,
+                                   size_t* padding_sent,
+                                   size_t* media_sent) const {
   *total_packets_sent += stream.rtp_stats.transmitted.packets +
                          stream.rtp_stats.retransmitted.packets +
                          stream.rtp_stats.fec.packets;
   *total_sent += stream.rtp_stats.transmitted.TotalBytes() +
                  stream.rtp_stats.retransmitted.TotalBytes() +
                  stream.rtp_stats.fec.TotalBytes();
   *padding_sent += stream.rtp_stats.transmitted.padding_bytes +
                    stream.rtp_stats.retransmitted.padding_bytes +
                    stream.rtp_stats.fec.padding_bytes;
   *media_sent += stream.rtp_stats.MediaPayloadBytes();
 }
 
 void RampUpTester::TriggerTestDone() {
   VideoSendStream::Stats send_stats = send_stream_->GetStats();
 
   size_t total_packets_sent = 0;
   size_t total_sent = 0;
   size_t padding_sent = 0;
   size_t media_sent = 0;
   for (uint32_t ssrc : ssrcs_) {
-    GetStats(send_stats.substreams[ssrc], &total_packets_sent, &total_sent,
-             &padding_sent, &media_sent);
+    AccumulateStats(send_stats.substreams[ssrc], &total_packets_sent,
+                    &total_sent, &padding_sent, &media_sent);
   }
 
   size_t rtx_total_packets_sent = 0;
   size_t rtx_total_sent = 0;
   size_t rtx_padding_sent = 0;
   size_t rtx_media_sent = 0;
   for (uint32_t rtx_ssrc : rtx_ssrcs_) {
-    GetStats(send_stats.substreams[rtx_ssrc], &total_packets_sent, &total_sent,
-             &padding_sent, &media_sent);
+    AccumulateStats(send_stats.substreams[rtx_ssrc], &rtx_total_packets_sent,
+                    &rtx_total_sent, &rtx_padding_sent, &rtx_media_sent);
   }
 
   ReportResult("ramp-up-total-packets-sent", total_packets_sent, "packets");
   ReportResult("ramp-up-total-sent", total_sent, "bytes");
   ReportResult("ramp-up-media-sent", media_sent, "bytes");
   ReportResult("ramp-up-padding-sent", padding_sent, "bytes");
   ReportResult("ramp-up-rtx-total-packets-sent", rtx_total_packets_sent,
                "packets");
   ReportResult("ramp-up-rtx-total-sent", rtx_total_sent, "bytes");
   ReportResult("ramp-up-rtx-media-sent", rtx_media_sent, "bytes");
@@ skipping 232 matching lines @@
   RampUpTester test(3, 0, RtpExtension::kTransportSequenceNumber, true, true);
   RunBaseTest(&test);
 }
 
 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) {
   RampUpTester test(1, 0.9 * kSingleStreamTargetBps,
                     RtpExtension::kTransportSequenceNumber, false, false);
   RunBaseTest(&test);
 }
 }  // namespace webrtc