From b96a3118adf410635721c4780b8c746244ae2fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Wed, 2 Oct 2019 13:27:16 +0200
Subject: [PATCH] Sum byte counts for all reports of type kStatsReportTypeSsrc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: webrtc:11003
Change-Id: I6d4bb13710e23e32da36122379226e1a55031008
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/155364
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29370}
---
 .../e2e/network_quality_metrics_reporter.cc   | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/test/pc/e2e/network_quality_metrics_reporter.cc b/test/pc/e2e/network_quality_metrics_reporter.cc
index 95dc0ddb5c..56f0337037 100644
--- a/test/pc/e2e/network_quality_metrics_reporter.cc
+++ b/test/pc/e2e/network_quality_metrics_reporter.cc
@@ -43,18 +43,25 @@ void NetworkQualityMetricsReporter::OnStatsReports(
     const std::string& pc_label,
     const StatsReports& reports) {
   rtc::CritScope cs(&lock_);
-  PCStats& stats = pc_stats_[pc_label];
+  int64_t payload_bytes_received = 0;
+  int64_t payload_bytes_sent = 0;
   for (const StatsReport* report : reports) {
-    const auto* received =
-        report->FindValue(StatsReport::kStatsValueNameBytesReceived);
-    if (received) {
-      stats.payload_bytes_received = received->int64_val();
-    }
-    const auto* sent = report->FindValue(StatsReport::kStatsValueNameBytesSent);
-    if (sent) {
-      stats.payload_bytes_sent = sent->int64_val();
+    if (report->type() == StatsReport::kStatsReportTypeSsrc) {
+      const auto* received =
+          report->FindValue(StatsReport::kStatsValueNameBytesReceived);
+      if (received) {
+        payload_bytes_received += received->int64_val();
+      }
+      const auto* sent =
+          report->FindValue(StatsReport::kStatsValueNameBytesSent);
+      if (sent) {
+        payload_bytes_sent += sent->int64_val();
+      }
     }
   }
+  PCStats& stats = pc_stats_[pc_label];
+  stats.payload_bytes_received = payload_bytes_received;
+  stats.payload_bytes_sent = payload_bytes_sent;
 }
 
 void NetworkQualityMetricsReporter::StopAndReportResults() {