Replace "rcvd" with "received" for readability

following guidance in
  https://google.github.io/styleguide/cppguide.html#General_Naming_Rules

BUG=None

Change-Id: I105591a7f709d65a3d3320f7f44137d432cf7ce0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/302282
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#39937}

audio/audio_receive_stream.cc

@@ -259,10 +259,10 @@ webrtc::AudioReceiveStreamInterface::Stats AudioReceiveStreamImpl::GetStats(
     return stats;
   }
 
-  stats.payload_bytes_rcvd = call_stats.payload_bytes_rcvd;
+  stats.payload_bytes_received = call_stats.payload_bytes_received;
-  stats.header_and_padding_bytes_rcvd =
+  stats.header_and_padding_bytes_received =
-      call_stats.header_and_padding_bytes_rcvd;
+      call_stats.header_and_padding_bytes_received;
-  stats.packets_rcvd = call_stats.packetsReceived;
+  stats.packets_received = call_stats.packetsReceived;
   stats.packets_lost = call_stats.cumulativeLost;
   stats.nacks_sent = call_stats.nacks_sent;
   stats.capture_start_ntp_time_ms = call_stats.capture_start_ntp_time_ms_;

audio/audio_receive_stream_unittest.cc

@@ -243,11 +243,11 @@ TEST(AudioReceiveStreamTest, GetStats) {
     AudioReceiveStreamInterface::Stats stats =
         recv_stream->GetStats(/*get_and_clear_legacy_stats=*/true);
     EXPECT_EQ(kRemoteSsrc, stats.remote_ssrc);
-    EXPECT_EQ(kCallStats.payload_bytes_rcvd, stats.payload_bytes_rcvd);
+    EXPECT_EQ(kCallStats.payload_bytes_received, stats.payload_bytes_received);
-    EXPECT_EQ(kCallStats.header_and_padding_bytes_rcvd,
+    EXPECT_EQ(kCallStats.header_and_padding_bytes_received,
-              stats.header_and_padding_bytes_rcvd);
+              stats.header_and_padding_bytes_received);
     EXPECT_EQ(static_cast<uint32_t>(kCallStats.packetsReceived),
-              stats.packets_rcvd);
+              stats.packets_received);
     EXPECT_EQ(kCallStats.cumulativeLost, stats.packets_lost);
     EXPECT_EQ(kReceiveCodec.second.name, stats.codec_name);
     EXPECT_EQ(

audio/audio_send_stream.cc

@@ -485,7 +485,7 @@ webrtc::AudioSendStream::Stats AudioSendStream::GetStats(
 
   stats.report_block_datas = std::move(call_stats.report_block_datas);
 
-  stats.nacks_rcvd = call_stats.nacks_rcvd;
+  stats.nacks_received = call_stats.nacks_received;
 
   return stats;
 }

audio/channel_receive.cc

@@ -826,17 +826,17 @@ CallReceiveStatistics ChannelReceive::GetRTCPStatistics() const {
 
   // Data counters.
   if (statistician) {
-    stats.payload_bytes_rcvd = rtp_stats.packet_counter.payload_bytes;
+    stats.payload_bytes_received = rtp_stats.packet_counter.payload_bytes;
 
-    stats.header_and_padding_bytes_rcvd =
+    stats.header_and_padding_bytes_received =
         rtp_stats.packet_counter.header_bytes +
         rtp_stats.packet_counter.padding_bytes;
     stats.packetsReceived = rtp_stats.packet_counter.packets;
     stats.last_packet_received_timestamp_ms =
         rtp_stats.last_packet_received_timestamp_ms;
   } else {
-    stats.payload_bytes_rcvd = 0;
+    stats.payload_bytes_received = 0;
-    stats.header_and_padding_bytes_rcvd = 0;
+    stats.header_and_padding_bytes_received = 0;
     stats.packetsReceived = 0;
     stats.last_packet_received_timestamp_ms = absl::nullopt;
   }

audio/channel_receive.h

@@ -53,8 +53,8 @@ class RtpRtcp;
 struct CallReceiveStatistics {
   int cumulativeLost;
   unsigned int jitterSamples;
-  int64_t payload_bytes_rcvd = 0;
+  int64_t payload_bytes_received = 0;
-  int64_t header_and_padding_bytes_rcvd = 0;
+  int64_t header_and_padding_bytes_received = 0;
   int packetsReceived;
   uint32_t nacks_sent = 0;
   // The capture NTP time (in local timebase) of the first played out audio

audio/channel_send.cc

@@ -784,7 +784,7 @@ CallSendStatistics ChannelSend::GetRTCPStatistics() const {
 
   {
     MutexLock lock(&rtcp_counter_mutex_);
-    stats.nacks_rcvd = rtcp_packet_type_counter_.nack_packets;
+    stats.nacks_received = rtcp_packet_type_counter_.nack_packets;
   }
 
   return stats;

audio/channel_send.h

@@ -48,7 +48,7 @@ struct CallSendStatistics {
   // ReportBlockData represents the latest Report Block that was received for
   // that pair.
   std::vector<ReportBlockData> report_block_datas;
-  uint32_t nacks_rcvd;
+  uint32_t nacks_received;
 };
 
 // See section 6.4.2 in http://www.ietf.org/rfc/rfc3550.txt for details.

audio/test/audio_stats_test.cc

@@ -70,8 +70,8 @@ class NoLossTest : public AudioEndToEndTest {
 
     AudioReceiveStreamInterface::Stats recv_stats =
         receive_stream()->GetStats(/*get_and_clear_legacy_stats=*/true);
-    EXPECT_PRED2(IsNear, kBytesSent, recv_stats.payload_bytes_rcvd);
+    EXPECT_PRED2(IsNear, kBytesSent, recv_stats.payload_bytes_received);
-    EXPECT_PRED2(IsNear, kPacketsSent, recv_stats.packets_rcvd);
+    EXPECT_PRED2(IsNear, kPacketsSent, recv_stats.packets_received);
     EXPECT_EQ(0, recv_stats.packets_lost);
     EXPECT_EQ("opus", send_stats.codec_name);
     // recv_stats.jitter_ms

audio/test/nack_test.cc

@@ -48,7 +48,7 @@ TEST_F(NackTest, ShouldNackInLossyNetwork) {
       EXPECT_GT(recv_stats.nacks_sent, 0U);
       AudioSendStream::Stats send_stats = send_stream()->GetStats();
       EXPECT_GT(send_stats.retransmitted_packets_sent, 0U);
-      EXPECT_GT(send_stats.nacks_rcvd, 0U);
+      EXPECT_GT(send_stats.nacks_received, 0U);
     }
   } test;
 

call/audio_receive_stream.h

@@ -33,9 +33,9 @@ class AudioReceiveStreamInterface : public MediaReceiveStreamInterface {
     Stats();
     ~Stats();
     uint32_t remote_ssrc = 0;
-    int64_t payload_bytes_rcvd = 0;
+    int64_t payload_bytes_received = 0;
-    int64_t header_and_padding_bytes_rcvd = 0;
+    int64_t header_and_padding_bytes_received = 0;
-    uint32_t packets_rcvd = 0;
+    uint32_t packets_received = 0;
     uint64_t fec_packets_received = 0;
     uint64_t fec_packets_discarded = 0;
     int32_t packets_lost = 0;

call/audio_send_stream.h

@@ -72,7 +72,7 @@ class AudioSendStream : public AudioSender {
     // per-pair the ReportBlockData represents the latest Report Block that was
     // received for that pair.
     std::vector<ReportBlockData> report_block_datas;
-    uint32_t nacks_rcvd = 0;
+    uint32_t nacks_received = 0;
   };
 
   struct Config {

media/base/media_channel.h

@@ -382,7 +382,7 @@ struct MediaSenderInfo {
   // https://w3c.github.io/webrtc-stats/#dom-rtcoutboundrtpstreamstats-retransmittedpacketssent
   uint64_t retransmitted_packets_sent = 0;
   // https://w3c.github.io/webrtc-stats/#dom-rtcoutboundrtpstreamstats-nackcount
-  uint32_t nacks_rcvd = 0;
+  uint32_t nacks_received = 0;
   // https://w3c.github.io/webrtc-stats/#dom-rtcoutboundrtpstreamstats-targetbitrate
   absl::optional<double> target_bitrate;
   int packets_lost = 0;
@@ -438,10 +438,10 @@ struct MediaReceiverInfo {
   }
 
   // https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-bytesreceived
-  int64_t payload_bytes_rcvd = 0;
+  int64_t payload_bytes_received = 0;
   // https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-headerbytesreceived
-  int64_t header_and_padding_bytes_rcvd = 0;
+  int64_t header_and_padding_bytes_received = 0;
-  int packets_rcvd = 0;
+  int packets_received = 0;
   int packets_lost = 0;
   absl::optional<uint32_t> nacks_sent;
   // Jitter (network-related) latency (cumulative).
@@ -564,8 +564,8 @@ struct VideoSenderInfo : public MediaSenderInfo {
   ~VideoSenderInfo();
   std::vector<SsrcGroup> ssrc_groups;
   std::string encoder_implementation_name;
-  int firs_rcvd = 0;
+  int firs_received = 0;
-  int plis_rcvd = 0;
+  int plis_received = 0;
   int send_frame_width = 0;
   int send_frame_height = 0;
   int frames = 0;
@@ -614,7 +614,7 @@ struct VideoReceiverInfo : public MediaReceiverInfo {
   int plis_sent = 0;
   int frame_width = 0;
   int frame_height = 0;
-  int framerate_rcvd = 0;
+  int framerate_received = 0;
   int framerate_decoded = 0;
   int framerate_output = 0;
   // Framerate as sent to the renderer.

media/engine/webrtc_video_engine.cc

@@ -2786,9 +2786,9 @@ WebRtcVideoChannel::WebRtcVideoSendStream::GetPerLayerVideoSenderInfos(
         stream_stats.rtp_stats.retransmitted.payload_bytes;
     info.retransmitted_packets_sent =
         stream_stats.rtp_stats.retransmitted.packets;
-    info.firs_rcvd = stream_stats.rtcp_packet_type_counts.fir_packets;
+    info.firs_received = stream_stats.rtcp_packet_type_counts.fir_packets;
-    info.nacks_rcvd = stream_stats.rtcp_packet_type_counts.nack_packets;
+    info.nacks_received = stream_stats.rtcp_packet_type_counts.nack_packets;
-    info.plis_rcvd = stream_stats.rtcp_packet_type_counts.pli_packets;
+    info.plis_received = stream_stats.rtcp_packet_type_counts.pli_packets;
     if (stream_stats.report_block_data.has_value()) {
       info.packets_lost =
           stream_stats.report_block_data->report_block().packets_lost;
@@ -2838,9 +2838,9 @@ WebRtcVideoChannel::WebRtcVideoSendStream::GetAggregatedVideoSenderInfo(
       info.send_frame_width = infos[i].send_frame_width;
     if (infos[i].send_frame_height > info.send_frame_height)
       info.send_frame_height = infos[i].send_frame_height;
-    info.firs_rcvd += infos[i].firs_rcvd;
+    info.firs_received += infos[i].firs_received;
-    info.nacks_rcvd += infos[i].nacks_rcvd;
+    info.nacks_received += infos[i].nacks_received;
-    info.plis_rcvd += infos[i].plis_rcvd;
+    info.plis_received += infos[i].plis_received;
     if (infos[i].report_block_datas.size())
       info.report_block_datas.push_back(infos[i].report_block_datas[0]);
     if (infos[i].qp_sum) {
@@ -3301,15 +3301,15 @@ WebRtcVideoChannel::WebRtcVideoReceiveStream::GetVideoReceiverInfo(
     if (decoder_it != config_.decoders.end())
       info.codec_name = decoder_it->video_format.name;
   }
-  info.payload_bytes_rcvd = stats.rtp_stats.packet_counter.payload_bytes;
+  info.payload_bytes_received = stats.rtp_stats.packet_counter.payload_bytes;
-  info.header_and_padding_bytes_rcvd =
+  info.header_and_padding_bytes_received =
       stats.rtp_stats.packet_counter.header_bytes +
       stats.rtp_stats.packet_counter.padding_bytes;
-  info.packets_rcvd = stats.rtp_stats.packet_counter.packets;
+  info.packets_received = stats.rtp_stats.packet_counter.packets;
   info.packets_lost = stats.rtp_stats.packets_lost;
   info.jitter_ms = stats.rtp_stats.jitter / (kVideoCodecClockrate / 1000);
 
-  info.framerate_rcvd = stats.network_frame_rate;
+  info.framerate_received = stats.network_frame_rate;
   info.framerate_decoded = stats.decode_frame_rate;
   info.framerate_output = stats.render_frame_rate;
   info.frame_width = stats.width;

media/engine/webrtc_video_engine_unittest.cc

@@ -2020,17 +2020,17 @@ TEST_F(WebRtcVideoChannelBaseTest, GetStats) {
   EXPECT_TRUE(channel_->GetReceiveStats(&receive_info));
 
   ASSERT_EQ(1U, send_info.senders.size());
-  // TODO(whyuan): bytes_sent and bytes_rcvd are different. Are both payload?
+  // TODO(whyuan): bytes_sent and bytes_received are different. Are both
-  // For webrtc, bytes_sent does not include the RTP header length.
+  // payload? For webrtc, bytes_sent does not include the RTP header length.
   EXPECT_EQ(send_info.senders[0].payload_bytes_sent,
             NumRtpBytes() - kRtpHeaderSize * NumRtpPackets());
   EXPECT_EQ(NumRtpPackets(), send_info.senders[0].packets_sent);
   EXPECT_EQ(0.0, send_info.senders[0].fraction_lost);
   ASSERT_TRUE(send_info.senders[0].codec_payload_type);
   EXPECT_EQ(DefaultCodec().id, *send_info.senders[0].codec_payload_type);
-  EXPECT_EQ(0, send_info.senders[0].firs_rcvd);
+  EXPECT_EQ(0, send_info.senders[0].firs_received);
-  EXPECT_EQ(0, send_info.senders[0].plis_rcvd);
+  EXPECT_EQ(0, send_info.senders[0].plis_received);
-  EXPECT_EQ(0u, send_info.senders[0].nacks_rcvd);
+  EXPECT_EQ(0u, send_info.senders[0].nacks_received);
   EXPECT_EQ(kVideoWidth, send_info.senders[0].send_frame_width);
   EXPECT_EQ(kVideoHeight, send_info.senders[0].send_frame_height);
   EXPECT_GT(send_info.senders[0].framerate_input, 0);
@@ -2048,8 +2048,8 @@ TEST_F(WebRtcVideoChannelBaseTest, GetStats) {
   ASSERT_TRUE(receive_info.receivers[0].codec_payload_type);
   EXPECT_EQ(DefaultCodec().id, *receive_info.receivers[0].codec_payload_type);
   EXPECT_EQ(NumRtpBytes() - kRtpHeaderSize * NumRtpPackets(),
-            receive_info.receivers[0].payload_bytes_rcvd);
+            receive_info.receivers[0].payload_bytes_received);
-  EXPECT_EQ(NumRtpPackets(), receive_info.receivers[0].packets_rcvd);
+  EXPECT_EQ(NumRtpPackets(), receive_info.receivers[0].packets_received);
   EXPECT_EQ(0, receive_info.receivers[0].packets_lost);
   // TODO(asapersson): Not set for webrtc. Handle missing stats.
   // EXPECT_EQ(0, receive_info.receivers[0].packets_concealed);
@@ -2058,7 +2058,7 @@ TEST_F(WebRtcVideoChannelBaseTest, GetStats) {
   EXPECT_EQ(0U, receive_info.receivers[0].nacks_sent);
   EXPECT_EQ(kVideoWidth, receive_info.receivers[0].frame_width);
   EXPECT_EQ(kVideoHeight, receive_info.receivers[0].frame_height);
-  EXPECT_GT(receive_info.receivers[0].framerate_rcvd, 0);
+  EXPECT_GT(receive_info.receivers[0].framerate_received, 0);
   EXPECT_GT(receive_info.receivers[0].framerate_decoded, 0);
   EXPECT_GT(receive_info.receivers[0].framerate_output, 0);
 
@@ -2100,8 +2100,8 @@ TEST_F(WebRtcVideoChannelBaseTest, GetStatsMultipleRecvStreams) {
   EXPECT_TRUE(channel_->GetReceiveStats(&receive_info));
 
   ASSERT_EQ(1U, send_info.senders.size());
-  // TODO(whyuan): bytes_sent and bytes_rcvd are different. Are both payload?
+  // TODO(whyuan): bytes_sent and bytes_received are different. Are both
-  // For webrtc, bytes_sent does not include the RTP header length.
+  // payload? For webrtc, bytes_sent does not include the RTP header length.
   EXPECT_EQ(NumRtpBytes() - kRtpHeaderSize * NumRtpPackets(),
             GetSenderStats(0).payload_bytes_sent);
   EXPECT_EQ(NumRtpPackets(), GetSenderStats(0).packets_sent);
@@ -2113,8 +2113,8 @@ TEST_F(WebRtcVideoChannelBaseTest, GetStatsMultipleRecvStreams) {
     EXPECT_EQ(1U, GetReceiverStats(i).ssrcs().size());
     EXPECT_EQ(i + 1, GetReceiverStats(i).ssrcs()[0]);
     EXPECT_EQ(NumRtpBytes() - kRtpHeaderSize * NumRtpPackets(),
-              GetReceiverStats(i).payload_bytes_rcvd);
+              GetReceiverStats(i).payload_bytes_received);
-    EXPECT_EQ(NumRtpPackets(), GetReceiverStats(i).packets_rcvd);
+    EXPECT_EQ(NumRtpPackets(), GetReceiverStats(i).packets_received);
     EXPECT_EQ(kVideoWidth, GetReceiverStats(i).frame_width);
     EXPECT_EQ(kVideoHeight, GetReceiverStats(i).frame_height);
   }
@@ -5793,9 +5793,9 @@ TEST_F(WebRtcVideoChannelTest, GetAggregatedStatsReportWithoutSubStreams) {
   EXPECT_EQ(sender.encoder_implementation_name,
             stats.encoder_implementation_name);
   // Comes from substream only.
-  EXPECT_EQ(sender.firs_rcvd, 0);
+  EXPECT_EQ(sender.firs_received, 0);
-  EXPECT_EQ(sender.plis_rcvd, 0);
+  EXPECT_EQ(sender.plis_received, 0);
-  EXPECT_EQ(sender.nacks_rcvd, 0u);
+  EXPECT_EQ(sender.nacks_received, 0u);
   EXPECT_EQ(sender.send_frame_width, 0);
   EXPECT_EQ(sender.send_frame_height, 0);
 
@@ -5920,12 +5920,12 @@ TEST_F(WebRtcVideoChannelTest, GetAggregatedStatsReportForSubStreams) {
   EXPECT_EQ(sender.encoder_implementation_name,
             stats.encoder_implementation_name);
   EXPECT_EQ(
-      sender.firs_rcvd,
+      sender.firs_received,
       static_cast<int>(2 * substream.rtcp_packet_type_counts.fir_packets));
   EXPECT_EQ(
-      sender.plis_rcvd,
+      sender.plis_received,
       static_cast<int>(2 * substream.rtcp_packet_type_counts.pli_packets));
-  EXPECT_EQ(sender.nacks_rcvd,
+  EXPECT_EQ(sender.nacks_received,
             2 * substream.rtcp_packet_type_counts.nack_packets);
   EXPECT_EQ(sender.send_frame_width, substream.width);
   EXPECT_EQ(sender.send_frame_height, substream.height);
@@ -6045,11 +6045,12 @@ TEST_F(WebRtcVideoChannelTest, GetPerLayerStatsReportForSubStreams) {
   EXPECT_EQ(sender.ssrc_groups.size(), 0u);
   EXPECT_EQ(sender.encoder_implementation_name,
             stats.encoder_implementation_name);
-  EXPECT_EQ(sender.firs_rcvd,
+  EXPECT_EQ(sender.firs_received,
             static_cast<int>(substream.rtcp_packet_type_counts.fir_packets));
-  EXPECT_EQ(sender.plis_rcvd,
+  EXPECT_EQ(sender.plis_received,
             static_cast<int>(substream.rtcp_packet_type_counts.pli_packets));
-  EXPECT_EQ(sender.nacks_rcvd, substream.rtcp_packet_type_counts.nack_packets);
+  EXPECT_EQ(sender.nacks_received,
+            substream.rtcp_packet_type_counts.nack_packets);
   EXPECT_EQ(sender.send_frame_width, substream.width);
   EXPECT_EQ(sender.send_frame_height, substream.height);
 
@@ -6486,17 +6487,17 @@ TEST_F(WebRtcVideoChannelTest, GetStatsTranslatesSendRtcpPacketTypesCorrectly) {
   EXPECT_TRUE(channel_->GetSendStats(&send_info));
   EXPECT_TRUE(channel_->GetReceiveStats(&receive_info));
 
-  EXPECT_EQ(2, send_info.senders[0].firs_rcvd);
+  EXPECT_EQ(2, send_info.senders[0].firs_received);
-  EXPECT_EQ(3u, send_info.senders[0].nacks_rcvd);
+  EXPECT_EQ(3u, send_info.senders[0].nacks_received);
-  EXPECT_EQ(4, send_info.senders[0].plis_rcvd);
+  EXPECT_EQ(4, send_info.senders[0].plis_received);
 
-  EXPECT_EQ(5, send_info.senders[1].firs_rcvd);
+  EXPECT_EQ(5, send_info.senders[1].firs_received);
-  EXPECT_EQ(7u, send_info.senders[1].nacks_rcvd);
+  EXPECT_EQ(7u, send_info.senders[1].nacks_received);
-  EXPECT_EQ(9, send_info.senders[1].plis_rcvd);
+  EXPECT_EQ(9, send_info.senders[1].plis_received);
 
-  EXPECT_EQ(7, send_info.aggregated_senders[0].firs_rcvd);
+  EXPECT_EQ(7, send_info.aggregated_senders[0].firs_received);
-  EXPECT_EQ(10u, send_info.aggregated_senders[0].nacks_rcvd);
+  EXPECT_EQ(10u, send_info.aggregated_senders[0].nacks_received);
-  EXPECT_EQ(13, send_info.aggregated_senders[0].plis_rcvd);
+  EXPECT_EQ(13, send_info.aggregated_senders[0].plis_received);
 }
 
 TEST_F(WebRtcVideoChannelTest,
@@ -6621,12 +6622,12 @@ TEST_F(WebRtcVideoChannelTest, GetStatsTranslatesReceivePacketStatsCorrectly) {
   EXPECT_TRUE(channel_->GetSendStats(&send_info));
   EXPECT_TRUE(channel_->GetReceiveStats(&receive_info));
 
-  EXPECT_EQ(
+  EXPECT_EQ(stats.rtp_stats.packet_counter.payload_bytes,
-      stats.rtp_stats.packet_counter.payload_bytes,
+            rtc::checked_cast<size_t>(
-      rtc::checked_cast<size_t>(receive_info.receivers[0].payload_bytes_rcvd));
+                receive_info.receivers[0].payload_bytes_received));
-  EXPECT_EQ(
+  EXPECT_EQ(stats.rtp_stats.packet_counter.packets,
-      stats.rtp_stats.packet_counter.packets,
+            rtc::checked_cast<unsigned int>(
-      rtc::checked_cast<unsigned int>(receive_info.receivers[0].packets_rcvd));
+                receive_info.receivers[0].packets_received));
   EXPECT_EQ(stats.rtp_stats.packets_lost,
             receive_info.receivers[0].packets_lost);
 }

media/engine/webrtc_voice_engine.cc

@@ -2331,7 +2331,7 @@ bool WebRtcVoiceMediaChannel::GetSendStats(VoiceMediaSendInfo* info) {
     sinfo.retransmitted_packets_sent = stats.retransmitted_packets_sent;
     sinfo.packets_lost = stats.packets_lost;
     sinfo.fraction_lost = stats.fraction_lost;
-    sinfo.nacks_rcvd = stats.nacks_rcvd;
+    sinfo.nacks_received = stats.nacks_received;
     sinfo.target_bitrate = stats.target_bitrate_bps;
     sinfo.codec_name = stats.codec_name;
     sinfo.codec_payload_type = stats.codec_payload_type;
@@ -2387,9 +2387,10 @@ bool WebRtcVoiceMediaChannel::GetReceiveStats(VoiceMediaReceiveInfo* info,
         stream.second->GetStats(get_and_clear_legacy_stats);
     VoiceReceiverInfo rinfo;
     rinfo.add_ssrc(stats.remote_ssrc);
-    rinfo.payload_bytes_rcvd = stats.payload_bytes_rcvd;
+    rinfo.payload_bytes_received = stats.payload_bytes_received;
-    rinfo.header_and_padding_bytes_rcvd = stats.header_and_padding_bytes_rcvd;
+    rinfo.header_and_padding_bytes_received =
-    rinfo.packets_rcvd = stats.packets_rcvd;
+        stats.header_and_padding_bytes_received;
+    rinfo.packets_received = stats.packets_received;
     rinfo.fec_packets_received = stats.fec_packets_received;
     rinfo.fec_packets_discarded = stats.fec_packets_discarded;
     rinfo.packets_lost = stats.packets_lost;

media/engine/webrtc_voice_engine_unittest.cc

@@ -678,9 +678,9 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam<bool> {
       const {
     webrtc::AudioReceiveStreamInterface::Stats stats;
     stats.remote_ssrc = 123;
-    stats.payload_bytes_rcvd = 456;
+    stats.payload_bytes_received = 456;
-    stats.header_and_padding_bytes_rcvd = 67;
+    stats.header_and_padding_bytes_received = 67;
-    stats.packets_rcvd = 768;
+    stats.packets_received = 768;
     stats.packets_lost = 101;
     stats.codec_name = "codec_name_recv";
     stats.codec_payload_type = 0;
@@ -719,11 +719,11 @@ class WebRtcVoiceEngineTestFake : public ::testing::TestWithParam<bool> {
   void VerifyVoiceReceiverInfo(const cricket::VoiceReceiverInfo& info) {
     const auto stats = GetAudioReceiveStreamStats();
     EXPECT_EQ(info.ssrc(), stats.remote_ssrc);
-    EXPECT_EQ(info.payload_bytes_rcvd, stats.payload_bytes_rcvd);
+    EXPECT_EQ(info.payload_bytes_received, stats.payload_bytes_received);
-    EXPECT_EQ(info.header_and_padding_bytes_rcvd,
+    EXPECT_EQ(info.header_and_padding_bytes_received,
-              stats.header_and_padding_bytes_rcvd);
+              stats.header_and_padding_bytes_received);
-    EXPECT_EQ(rtc::checked_cast<unsigned int>(info.packets_rcvd),
+    EXPECT_EQ(rtc::checked_cast<unsigned int>(info.packets_received),
-              stats.packets_rcvd);
+              stats.packets_received);
     EXPECT_EQ(info.packets_lost, stats.packets_lost);
     EXPECT_EQ(info.codec_name, stats.codec_name);
     EXPECT_EQ(info.codec_payload_type, stats.codec_payload_type);

p2p/base/pseudo_tcp_unittest.cc

@@ -294,19 +294,19 @@ class PseudoTcpTest : public PseudoTcpTestBase {
   void ReadData() {
     char block[kBlockSize];
     size_t position;
-    int rcvd;
+    int received;
     do {
-      rcvd = remote_.Recv(block, sizeof(block));
+      received = remote_.Recv(block, sizeof(block));
-      if (rcvd != -1) {
+      if (received != -1) {
         size_t written;
         int error;
         recv_stream_.Write(
-            rtc::MakeArrayView(reinterpret_cast<uint8_t*>(block), rcvd),
+            rtc::MakeArrayView(reinterpret_cast<uint8_t*>(block), received),
             written, error);
         recv_stream_.GetPosition(&position);
         RTC_LOG(LS_VERBOSE) << "Received: " << position;
       }
-    } while (rcvd > 0);
+    } while (received > 0);
   }
   void WriteData(bool* done) {
     size_t position, tosend;
@@ -417,19 +417,20 @@ class PseudoTcpTestPingPong : public PseudoTcpTestBase {
   void ReadData() {
     char block[kBlockSize];
     size_t position;
-    int rcvd;
+    int received;
     do {
-      rcvd = receiver_->Recv(block, sizeof(block));
+      received = receiver_->Recv(block, sizeof(block));
-      if (rcvd != -1) {
+      if (received != -1) {
         size_t written;
         int error;
         recv_stream_.Write(
-            rtc::MakeArrayView(reinterpret_cast<const uint8_t*>(block), rcvd),
+            rtc::MakeArrayView(reinterpret_cast<const uint8_t*>(block),
+                               received),
             written, error);
         recv_stream_.GetPosition(&position);
         RTC_LOG(LS_VERBOSE) << "Received: " << position;
       }
-    } while (rcvd > 0);
+    } while (received > 0);
   }
   void WriteData() {
     size_t position, tosend;
@@ -524,20 +525,20 @@ class PseudoTcpTestReceiveWindow : public PseudoTcpTestBase {
   void ReadUntilIOPending() {
     char block[kBlockSize];
     size_t position;
-    int rcvd;
+    int received;
 
     do {
-      rcvd = remote_.Recv(block, sizeof(block));
+      received = remote_.Recv(block, sizeof(block));
-      if (rcvd != -1) {
+      if (received != -1) {
         size_t written;
         int error;
         recv_stream_.Write(
-            rtc::MakeArrayView(reinterpret_cast<uint8_t*>(block), rcvd),
+            rtc::MakeArrayView(reinterpret_cast<uint8_t*>(block), received),
             written, error);
         recv_stream_.GetPosition(&position);
         RTC_LOG(LS_VERBOSE) << "Received: " << position;
       }
-    } while (rcvd > 0);
+    } while (received > 0);
 
     recv_stream_.GetPosition(&position);
     recv_position_.push_back(position);

pc/legacy_stats_collector.cc

@@ -206,7 +206,7 @@ void ExtractStats(const cricket::VoiceReceiverInfo& info,
       {StatsReport::kStatsValueNameJitterBufferMs, info.jitter_buffer_ms},
       {StatsReport::kStatsValueNameJitterReceived, info.jitter_ms},
       {StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
-      {StatsReport::kStatsValueNamePacketsReceived, info.packets_rcvd},
+      {StatsReport::kStatsValueNamePacketsReceived, info.packets_received},
       {StatsReport::kStatsValueNamePreferredJitterBufferMs,
        info.jitter_buffer_preferred_ms},
   };
@@ -224,11 +224,11 @@ void ExtractStats(const cricket::VoiceReceiverInfo& info,
     report->AddInt(StatsReport::kStatsValueNameDecodingCodecPLC,
                    info.decoding_codec_plc);
 
-  int64_t bytes_rcvd = info.payload_bytes_rcvd;
+  int64_t bytes_received = info.payload_bytes_received;
   if (!use_standard_bytes_stats) {
-    bytes_rcvd += info.header_and_padding_bytes_rcvd;
+    bytes_received += info.header_and_padding_bytes_received;
   }
-  report->AddInt64(StatsReport::kStatsValueNameBytesReceived, bytes_rcvd);
+  report->AddInt64(StatsReport::kStatsValueNameBytesReceived, bytes_received);
   if (info.capture_start_ntp_time_ms >= 0) {
     report->AddInt64(StatsReport::kStatsValueNameCaptureStartNtpTimeMs,
                      info.capture_start_ntp_time_ms);
@@ -302,11 +302,11 @@ void ExtractStats(const cricket::VideoReceiverInfo& info,
   ExtractCommonReceiveProperties(info, report);
   report->AddString(StatsReport::kStatsValueNameCodecImplementationName,
                     info.decoder_implementation_name);
-  int64_t bytes_rcvd = info.payload_bytes_rcvd;
+  int64_t bytes_received = info.payload_bytes_received;
   if (!use_standard_bytes_stats) {
-    bytes_rcvd += info.header_and_padding_bytes_rcvd;
+    bytes_received += info.header_and_padding_bytes_received;
   }
-  report->AddInt64(StatsReport::kStatsValueNameBytesReceived, bytes_rcvd);
+  report->AddInt64(StatsReport::kStatsValueNameBytesReceived, bytes_received);
   if (info.capture_start_ntp_time_ms >= 0) {
     report->AddInt64(StatsReport::kStatsValueNameCaptureStartNtpTimeMs,
                      info.capture_start_ntp_time_ms);
@@ -329,14 +329,14 @@ void ExtractStats(const cricket::VideoReceiverInfo& info,
       {StatsReport::kStatsValueNameFrameHeightReceived, info.frame_height},
       {StatsReport::kStatsValueNameFrameRateDecoded, info.framerate_decoded},
       {StatsReport::kStatsValueNameFrameRateOutput, info.framerate_output},
-      {StatsReport::kStatsValueNameFrameRateReceived, info.framerate_rcvd},
+      {StatsReport::kStatsValueNameFrameRateReceived, info.framerate_received},
       {StatsReport::kStatsValueNameFrameWidthReceived, info.frame_width},
       {StatsReport::kStatsValueNameJitterBufferMs, info.jitter_buffer_ms},
       {StatsReport::kStatsValueNameMaxDecodeMs, info.max_decode_ms},
       {StatsReport::kStatsValueNameMinPlayoutDelayMs,
        info.min_playout_delay_ms},
       {StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
-      {StatsReport::kStatsValueNamePacketsReceived, info.packets_rcvd},
+      {StatsReport::kStatsValueNamePacketsReceived, info.packets_received},
       {StatsReport::kStatsValueNamePlisSent, info.plis_sent},
       {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
       {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
@@ -382,15 +382,15 @@ void ExtractStats(const cricket::VideoSenderInfo& info,
       {StatsReport::kStatsValueNameAvgEncodeMs, info.avg_encode_ms},
       {StatsReport::kStatsValueNameEncodeUsagePercent,
        info.encode_usage_percent},
-      {StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd},
+      {StatsReport::kStatsValueNameFirsReceived, info.firs_received},
       {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height},
       {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)},
       {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent},
       {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width},
-      {StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd},
+      {StatsReport::kStatsValueNameNacksReceived, info.nacks_received},
       {StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
       {StatsReport::kStatsValueNamePacketsSent, info.packets_sent},
-      {StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd},
+      {StatsReport::kStatsValueNamePlisReceived, info.plis_received},
       {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded},
       {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent},
   };

pc/legacy_stats_collector_unittest.cc

@@ -329,8 +329,8 @@ void VerifyVoiceReceiverInfoReport(const StatsReport* report,
   EXPECT_EQ(rtc::ToString(info.audio_level), value_in_report);
   EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNameBytesReceived,
                        &value_in_report));
-  EXPECT_EQ(rtc::ToString(info.payload_bytes_rcvd +
+  EXPECT_EQ(rtc::ToString(info.payload_bytes_received +
-                          info.header_and_padding_bytes_rcvd),
+                          info.header_and_padding_bytes_received),
             value_in_report);
   EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNameJitterReceived,
                        &value_in_report));
@@ -366,7 +366,7 @@ void VerifyVoiceReceiverInfoReport(const StatsReport* report,
   EXPECT_EQ(rtc::ToString(info.secondary_discarded_rate), value_in_report);
   EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNamePacketsReceived,
                        &value_in_report));
-  EXPECT_EQ(rtc::ToString(info.packets_rcvd), value_in_report);
+  EXPECT_EQ(rtc::ToString(info.packets_received), value_in_report);
   EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNameDecodingCTSG,
                        &value_in_report));
   EXPECT_EQ(rtc::ToString(info.decoding_calls_to_silence_generator),
@@ -566,9 +566,9 @@ void UpdateVoiceSenderInfoFromAudioTrack(
 
 void InitVoiceReceiverInfo(cricket::VoiceReceiverInfo* voice_receiver_info) {
   voice_receiver_info->add_ssrc(kSsrcOfTrack);
-  voice_receiver_info->payload_bytes_rcvd = 98;
+  voice_receiver_info->payload_bytes_received = 98;
-  voice_receiver_info->header_and_padding_bytes_rcvd = 12;
+  voice_receiver_info->header_and_padding_bytes_received = 12;
-  voice_receiver_info->packets_rcvd = 111;
+  voice_receiver_info->packets_received = 111;
   voice_receiver_info->packets_lost = 114;
   voice_receiver_info->jitter_ms = 116;
   voice_receiver_info->jitter_buffer_ms = 117;

pc/rtc_stats_collector.cc

@@ -416,11 +416,11 @@ void SetInboundRTPStreamStatsFromMediaReceiverInfo(
   RTC_DCHECK(inbound_stats);
   inbound_stats->ssrc = media_receiver_info.ssrc();
   inbound_stats->packets_received =
-      static_cast<uint32_t>(media_receiver_info.packets_rcvd);
+      static_cast<uint32_t>(media_receiver_info.packets_received);
   inbound_stats->bytes_received =
-      static_cast<uint64_t>(media_receiver_info.payload_bytes_rcvd);
+      static_cast<uint64_t>(media_receiver_info.payload_bytes_received);
-  inbound_stats->header_bytes_received =
+  inbound_stats->header_bytes_received = static_cast<uint64_t>(
-      static_cast<uint64_t>(media_receiver_info.header_and_padding_bytes_rcvd);
+      media_receiver_info.header_and_padding_bytes_received);
   inbound_stats->packets_lost =
       static_cast<int32_t>(media_receiver_info.packets_lost);
   inbound_stats->jitter_buffer_delay =
@@ -707,7 +707,7 @@ void SetOutboundRTPStreamStatsFromMediaSenderInfo(
       static_cast<uint64_t>(media_sender_info.header_and_padding_bytes_sent);
   outbound_stats->retransmitted_bytes_sent =
       media_sender_info.retransmitted_bytes_sent;
-  outbound_stats->nack_count = media_sender_info.nacks_rcvd;
+  outbound_stats->nack_count = media_sender_info.nacks_received;
   if (media_sender_info.active.has_value()) {
     outbound_stats->active = *media_sender_info.active;
   }
@@ -779,9 +779,9 @@ CreateOutboundRTPStreamStatsFromVideoSenderInfo(
     }
   }
   outbound_video->fir_count =
-      static_cast<uint32_t>(video_sender_info.firs_rcvd);
+      static_cast<uint32_t>(video_sender_info.firs_received);
   outbound_video->pli_count =
-      static_cast<uint32_t>(video_sender_info.plis_rcvd);
+      static_cast<uint32_t>(video_sender_info.plis_received);
   if (video_sender_info.qp_sum.has_value())
     outbound_video->qp_sum = *video_sender_info.qp_sum;
   if (video_sender_info.target_bitrate.has_value() &&

pc/rtc_stats_collector_unittest.cc

@@ -2473,12 +2473,12 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRtpStreamStats_Audio) {
   voice_media_info.receivers[0].local_stats[0].ssrc = 1;
   voice_media_info.receivers[0].packets_lost = -1;  // Signed per RFC3550
   voice_media_info.receivers[0].packets_discarded = 7788;
-  voice_media_info.receivers[0].packets_rcvd = 2;
+  voice_media_info.receivers[0].packets_received = 2;
   voice_media_info.receivers[0].nacks_sent = 5;
   voice_media_info.receivers[0].fec_packets_discarded = 5566;
   voice_media_info.receivers[0].fec_packets_received = 6677;
-  voice_media_info.receivers[0].payload_bytes_rcvd = 3;
+  voice_media_info.receivers[0].payload_bytes_received = 3;
-  voice_media_info.receivers[0].header_and_padding_bytes_rcvd = 4;
+  voice_media_info.receivers[0].header_and_padding_bytes_received = 4;
   voice_media_info.receivers[0].codec_payload_type = 42;
   voice_media_info.receivers[0].jitter_ms = 4500;
   voice_media_info.receivers[0].jitter_buffer_delay_seconds = 1.0;
@@ -2636,10 +2636,10 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRtpStreamStats_Video) {
   video_media_info.receivers[0].local_stats.push_back(
       cricket::SsrcReceiverInfo());
   video_media_info.receivers[0].local_stats[0].ssrc = 1;
-  video_media_info.receivers[0].packets_rcvd = 2;
+  video_media_info.receivers[0].packets_received = 2;
   video_media_info.receivers[0].packets_lost = 42;
-  video_media_info.receivers[0].payload_bytes_rcvd = 3;
+  video_media_info.receivers[0].payload_bytes_received = 3;
-  video_media_info.receivers[0].header_and_padding_bytes_rcvd = 12;
+  video_media_info.receivers[0].header_and_padding_bytes_received = 12;
   video_media_info.receivers[0].codec_payload_type = 42;
   video_media_info.receivers[0].firs_sent = 5;
   video_media_info.receivers[0].plis_sent = 6;
@@ -2679,7 +2679,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRtpStreamStats_Video) {
 
   // Note: these two values intentionally differ,
   // only the decoded one should show up.
-  video_media_info.receivers[0].framerate_rcvd = 15;
+  video_media_info.receivers[0].framerate_received = 15;
   video_media_info.receivers[0].framerate_decoded = 5;
 
   RtpCodecParameters codec_parameters;
@@ -2848,7 +2848,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRtpStreamStats_Audio) {
   voice_media_info.senders[0].payload_bytes_sent = 3;
   voice_media_info.senders[0].header_and_padding_bytes_sent = 12;
   voice_media_info.senders[0].retransmitted_bytes_sent = 30;
-  voice_media_info.senders[0].nacks_rcvd = 31;
+  voice_media_info.senders[0].nacks_received = 31;
   voice_media_info.senders[0].target_bitrate = 32000;
   voice_media_info.senders[0].codec_payload_type = 42;
   voice_media_info.senders[0].active = true;
@@ -2910,9 +2910,9 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRtpStreamStats_Video) {
   video_media_info.senders.push_back(cricket::VideoSenderInfo());
   video_media_info.senders[0].local_stats.push_back(cricket::SsrcSenderInfo());
   video_media_info.senders[0].local_stats[0].ssrc = 1;
-  video_media_info.senders[0].firs_rcvd = 2;
+  video_media_info.senders[0].firs_received = 2;
-  video_media_info.senders[0].plis_rcvd = 3;
+  video_media_info.senders[0].plis_received = 3;
-  video_media_info.senders[0].nacks_rcvd = 4;
+  video_media_info.senders[0].nacks_received = 4;
   video_media_info.senders[0].packets_sent = 5;
   video_media_info.senders[0].retransmitted_packets_sent = 50;
   video_media_info.senders[0].payload_bytes_sent = 6;
@@ -3291,7 +3291,7 @@ TEST_F(RTCStatsCollectorTest, CollectNoStreamRTCOutboundRtpStreamStats_Audio) {
   voice_media_info.senders[0].payload_bytes_sent = 3;
   voice_media_info.senders[0].header_and_padding_bytes_sent = 4;
   voice_media_info.senders[0].retransmitted_bytes_sent = 30;
-  voice_media_info.senders[0].nacks_rcvd = 31;
+  voice_media_info.senders[0].nacks_received = 31;
   voice_media_info.senders[0].codec_payload_type = 42;
   voice_media_info.senders[0].active = true;