From 00ff2bb36a9b7f7fdde606598b64b0af6584af74 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Fri, 5 May 2023 12:06:36 +0200
Subject: [PATCH] Cleanup usasge of ReportBlockData::report_block accessor in
 audio
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reduces dependency on the struct RTCPReportBlock and would allow to
delete it in favor of class ReportBlockData

Bug: None
Change-Id: I751c7fae1b0285eccdff6e0fe85c8e1ea7d7362c
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/304280
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Jakob Ivarsson‎ <jakobi@webrtc.org>
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39992}
---
 audio/voip/audio_ingress.cc | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/audio/voip/audio_ingress.cc b/audio/voip/audio_ingress.cc
index d2ea58da91..a00934cb46 100644
--- a/audio/voip/audio_ingress.cc
+++ b/audio/voip/audio_ingress.cc
@@ -260,25 +260,22 @@ ChannelStatistics AudioIngress::GetChannelStatistics() {
   // Get RTCP report using remote SSRC.
   const std::vector<ReportBlockData>& report_data =
       rtp_rtcp_->GetLatestReportBlockData();
-  for (const ReportBlockData& block_data : report_data) {
-    const RTCPReportBlock& rtcp_report = block_data.report_block();
-    if (rtp_rtcp_->SSRC() != rtcp_report.source_ssrc ||
-        remote_ssrc_ != rtcp_report.sender_ssrc) {
+  for (const ReportBlockData& rtcp_report : report_data) {
+    if (rtp_rtcp_->SSRC() != rtcp_report.source_ssrc() ||
+        remote_ssrc_ != rtcp_report.sender_ssrc()) {
       continue;
     }
     RemoteRtcpStatistics remote_stat;
-    remote_stat.packets_lost = rtcp_report.packets_lost;
-    remote_stat.fraction_lost =
-        static_cast<double>(rtcp_report.fraction_lost) / (1 << 8);
+    remote_stat.packets_lost = rtcp_report.cumulative_lost();
+    remote_stat.fraction_lost = rtcp_report.fraction_lost();
     if (clockrate_hz > 0) {
-      remote_stat.jitter =
-          static_cast<double>(rtcp_report.jitter) / clockrate_hz;
+      remote_stat.jitter = rtcp_report.jitter(clockrate_hz).seconds<double>();
     }
-    if (block_data.has_rtt()) {
-      remote_stat.round_trip_time = block_data.last_rtt().seconds<double>();
+    if (rtcp_report.has_rtt()) {
+      remote_stat.round_trip_time = rtcp_report.last_rtt().seconds<double>();
     }
     remote_stat.last_report_received_timestamp_ms =
-        block_data.report_block_timestamp_utc().ms();
+        rtcp_report.report_block_timestamp_utc().ms();
     channel_stats.remote_rtcp = remote_stat;
 
     // Receive only channel won't send any RTP packets.