zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update LegacyStatsCollector to conform with Wc++11-narrowing

Browse Source 
Cherry-picked from upstream:
https://webrtc-review.googlesource.com/c/src/+/332240

Bug: 322868540
Change-Id: Ida6a1af5c324473a55ea4f3b143862ea016ff50a
This commit is contained in:
Tommi
2023-12-21 14:08:26 +01:00
committed by Peter Collingbourne
parent cd3d5a7606
commit 80b751e95e
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
pc/legacy_stats_collector.cc
View File

@ -187,9 +187,10 @@ void ExtractStats(const cricket::VoiceReceiverInfo& info,
{StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate}, {StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate},
{StatsReport::kStatsValueNamePreemptiveExpandRate, {StatsReport::kStatsValueNamePreemptiveExpandRate,
info.preemptive_expand_rate}, info.preemptive_expand_rate},
{StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, {StatsReport::kStatsValueNameTotalAudioEnergy,
static_cast<float>(info.total_output_energy)},
{StatsReport::kStatsValueNameTotalSamplesDuration, {StatsReport::kStatsValueNameTotalSamplesDuration,
info.total_output_duration}}; static_cast<float>(info.total_output_duration)}};
const IntForAdd ints[] = { const IntForAdd ints[] = {
{StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms}, {StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms},
@ -243,9 +244,10 @@ void ExtractStats(const cricket::VoiceSenderInfo& info,
SetAudioProcessingStats(report, info.apm_statistics); SetAudioProcessingStats(report, info.apm_statistics);
const FloatForAdd floats[] = { const FloatForAdd floats[] = {
{StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, {StatsReport::kStatsValueNameTotalAudioEnergy,
static_cast<float>(info.total_input_energy)},
{StatsReport::kStatsValueNameTotalSamplesDuration, {StatsReport::kStatsValueNameTotalSamplesDuration,
info.total_input_duration}}; static_cast<float>(info.total_input_duration)}};
RTC_DCHECK_GE(info.audio_level, 0); RTC_DCHECK_GE(info.audio_level, 0);
const IntForAdd ints[] = { const IntForAdd ints[] = {
@ -339,7 +341,8 @@ void ExtractStats(const cricket::VideoReceiverInfo& info,
{StatsReport::kStatsValueNamePlisSent, info.plis_sent}, {StatsReport::kStatsValueNamePlisSent, info.plis_sent},
{StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
{StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
{StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, {StatsReport::kStatsValueNameFramesDecoded,
static_cast<int>(info.frames_decoded)},
}; };
for (const auto& i : ints) for (const auto& i : ints)
@ -383,15 +386,19 @@ void ExtractStats(const cricket::VideoSenderInfo& info,
info.encode_usage_percent}, info.encode_usage_percent},
{StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd}, {StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd},
{StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height},
{StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, {StatsReport::kStatsValueNameFrameRateInput,
static_cast<int>(round(info.framerate_input))},
{StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent},
{StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width},
{StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd}, {StatsReport::kStatsValueNameNacksReceived,
static_cast<int>(info.nacks_rcvd)},
{StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, {StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
{StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, {StatsReport::kStatsValueNamePacketsSent, info.packets_sent},
{StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd}, {StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd},
{StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, {StatsReport::kStatsValueNameFramesEncoded,
{StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, static_cast<int>(info.frames_encoded)},
{StatsReport::kStatsValueNameHugeFramesSent,
static_cast<int>(info.huge_frames_sent)},
}; };
for (const auto& i : ints) for (const auto& i : ints)
@ -780,19 +787,25 @@ StatsReport* LegacyStatsCollector::AddConnectionInfoReport(
AddCandidateReport(remote_candidate_stats, false)->id()); AddCandidateReport(remote_candidate_stats, false)->id());
const Int64ForAdd int64s[] = { const Int64ForAdd int64s[] = {
{StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, {StatsReport::kStatsValueNameBytesReceived,
{StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, static_cast<int64_t>(info.recv_total_bytes)},
{StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, {StatsReport::kStatsValueNameBytesSent,
{StatsReport::kStatsValueNameRtt, info.rtt}, static_cast<int64_t>(info.sent_total_bytes)},
{StatsReport::kStatsValueNamePacketsSent,
static_cast<int64_t>(info.sent_total_packets)},
{StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)},
{StatsReport::kStatsValueNameSendPacketsDiscarded, {StatsReport::kStatsValueNameSendPacketsDiscarded,
info.sent_discarded_packets}, static_cast<int64_t>(info.sent_discarded_packets)},
{StatsReport::kStatsValueNameSentPingRequestsTotal, {StatsReport::kStatsValueNameSentPingRequestsTotal,
info.sent_ping_requests_total}, static_cast<int64_t>(info.sent_ping_requests_total)},
{StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse,
info.sent_ping_requests_before_first_response}, static_cast<int64_t>(info.sent_ping_requests_before_first_response)},
{StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, {StatsReport::kStatsValueNameSentPingResponses,
{StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, static_cast<int64_t>(info.sent_ping_responses)},
{StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, {StatsReport::kStatsValueNameRecvPingRequests,
static_cast<int64_t>(info.recv_ping_requests)},
{StatsReport::kStatsValueNameRecvPingResponses,
static_cast<int64_t>(info.recv_ping_responses)},
}; };
for (const auto& i : int64s) for (const auto& i : int64s)
report->AddInt64(i.name, i.value); report->AddInt64(i.name, i.value);