admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup usasge of ReportBlockData::report_block accessor in audio

Browse Source 
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}
This commit is contained in:
Danil Chapovalov 2023-05-05 12:06:36 +02:00 committed by WebRTC LUCI CQ
parent ab7eb9df02
commit 00ff2bb36a
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
audio/voip/audio_ingress.cc
View File

@ -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.