Skip to content

Commit 2f0ba3b

Browse files
committed
[LibWebRTC] Build fails with clang-18 on Linux
https://bugs.webkit.org/show_bug.cgi?id=271752 Reviewed by Youenn Fablet. Fix -Wc++11-narrowing-const-reference warnings in LibWebRTC legacy stats collector. * Source/ThirdParty/libwebrtc/Source/webrtc/pc/legacy_stats_collector.cc: Canonical link: https://commits.webkit.org/276753@main
1 parent 4f83378 commit 2f0ba3b

1 file changed

Lines changed: 25 additions & 19 deletions

File tree

Source/ThirdParty/libwebrtc/Source/webrtc/pc/legacy_stats_collector.cc

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ void ExtractStats(const cricket::VoiceReceiverInfo& info,
188188
{StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate},
189189
{StatsReport::kStatsValueNamePreemptiveExpandRate,
190190
info.preemptive_expand_rate},
191-
{StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy},
191+
{StatsReport::kStatsValueNameTotalAudioEnergy, static_cast<float>(info.total_output_energy)},
192192
{StatsReport::kStatsValueNameTotalSamplesDuration,
193-
info.total_output_duration}};
193+
static_cast<float>(info.total_output_duration)}};
194194

195195
const IntForAdd ints[] = {
196196
{StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms},
@@ -244,9 +244,9 @@ void ExtractStats(const cricket::VoiceSenderInfo& info,
244244
SetAudioProcessingStats(report, info.apm_statistics);
245245

246246
const FloatForAdd floats[] = {
247-
{StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy},
247+
{StatsReport::kStatsValueNameTotalAudioEnergy, static_cast<float>(info.total_input_energy)},
248248
{StatsReport::kStatsValueNameTotalSamplesDuration,
249-
info.total_input_duration}};
249+
static_cast<float>(info.total_input_duration)}};
250250

251251
RTC_DCHECK_GE(info.audio_level, 0);
252252
const IntForAdd ints[] = {
@@ -340,7 +340,7 @@ void ExtractStats(const cricket::VideoReceiverInfo& info,
340340
{StatsReport::kStatsValueNamePlisSent, info.plis_sent},
341341
{StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
342342
{StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
343-
{StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded},
343+
{StatsReport::kStatsValueNameFramesDecoded, static_cast<int>(info.frames_decoded)},
344344
};
345345

346346
for (const auto& i : ints)
@@ -384,15 +384,15 @@ void ExtractStats(const cricket::VideoSenderInfo& info,
384384
info.encode_usage_percent},
385385
{StatsReport::kStatsValueNameFirsReceived, info.firs_received},
386386
{StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height},
387-
{StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)},
387+
{StatsReport::kStatsValueNameFrameRateInput, static_cast<int>(round(info.framerate_input))},
388388
{StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent},
389389
{StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width},
390-
{StatsReport::kStatsValueNameNacksReceived, info.nacks_received},
390+
{StatsReport::kStatsValueNameNacksReceived, static_cast<int>(info.nacks_received)},
391391
{StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
392392
{StatsReport::kStatsValueNamePacketsSent, info.packets_sent},
393393
{StatsReport::kStatsValueNamePlisReceived, info.plis_received},
394-
{StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded},
395-
{StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent},
394+
{StatsReport::kStatsValueNameFramesEncoded, static_cast<int>(info.frames_encoded)},
395+
{StatsReport::kStatsValueNameHugeFramesSent, static_cast<int>(info.huge_frames_sent)},
396396
};
397397

398398
for (const auto& i : ints)
@@ -780,19 +780,25 @@ StatsReport* LegacyStatsCollector::AddConnectionInfoReport(
780780
AddCandidateReport(remote_candidate_stats, false)->id());
781781

782782
const Int64ForAdd int64s[] = {
783-
{StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes},
784-
{StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes},
785-
{StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets},
786-
{StatsReport::kStatsValueNameRtt, info.rtt},
783+
{StatsReport::kStatsValueNameBytesReceived,
784+
static_cast<int64_t>(info.recv_total_bytes)},
785+
{StatsReport::kStatsValueNameBytesSent,
786+
static_cast<int64_t>(info.sent_total_bytes)},
787+
{StatsReport::kStatsValueNamePacketsSent,
788+
static_cast<int64_t>(info.sent_total_packets)},
789+
{StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)},
787790
{StatsReport::kStatsValueNameSendPacketsDiscarded,
788-
info.sent_discarded_packets},
791+
static_cast<int64_t>(info.sent_discarded_packets)},
789792
{StatsReport::kStatsValueNameSentPingRequestsTotal,
790-
info.sent_ping_requests_total},
793+
static_cast<int64_t>(info.sent_ping_requests_total)},
791794
{StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse,
792-
info.sent_ping_requests_before_first_response},
793-
{StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses},
794-
{StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests},
795-
{StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses},
795+
static_cast<int64_t>(info.sent_ping_requests_before_first_response)},
796+
{StatsReport::kStatsValueNameSentPingResponses,
797+
static_cast<int64_t>(info.sent_ping_responses)},
798+
{StatsReport::kStatsValueNameRecvPingRequests,
799+
static_cast<int64_t>(info.recv_ping_requests)},
800+
{StatsReport::kStatsValueNameRecvPingResponses,
801+
static_cast<int64_t>(info.recv_ping_responses)},
796802
};
797803
for (const auto& i : int64s)
798804
report->AddInt64(i.name, i.value);

0 commit comments

Comments
 (0)