Renamed fields in rtp_rtcp_defines.h/RTCPReportBlock

webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index 94783b721f411584168f3e4f0a848b57f5cee421..7270f3928a699a7dc08eb0a4a6b8016de5057f79 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -458,23 +458,23 @@ void RTCPReceiver::HandleReportBlock(const ReportBlock& report_block,
 
   ReportBlockWithRtt* report_block_info =
       &received_report_blocks_[report_block.source_ssrc()][remote_ssrc];
-  report_block_info->report_block.remoteSSRC = remote_ssrc;
-  report_block_info->report_block.sourceSSRC = report_block.source_ssrc();
-  report_block_info->report_block.fractionLost = report_block.fraction_lost();
-  report_block_info->report_block.cumulativeLost =
-      report_block.cumulative_lost();
+  report_block_info->report_block.sender_ssrc = remote_ssrc;
+  report_block_info->report_block.source_ssrc = report_block.source_ssrc();
+  report_block_info->report_block.fraction_lost = report_block.fraction_lost();
+  report_block_info->report_block.packets_lost = report_block.cumulative_lost();
   if (report_block.extended_high_seq_num() >
-      report_block_info->report_block.extendedHighSeqNum) {
+      report_block_info->report_block.extended_highest_sequence_number) {
     // We have successfully delivered new RTP packets to the remote side after
     // the last RR was sent from the remote side.
     last_increased_sequence_number_ms_ = clock_->TimeInMilliseconds();
   }
-  report_block_info->report_block.extendedHighSeqNum =
+  report_block_info->report_block.extended_highest_sequence_number =
       report_block.extended_high_seq_num();
   report_block_info->report_block.jitter = report_block.jitter();
-  report_block_info->report_block.delaySinceLastSR =
+  report_block_info->report_block.delay_since_last_sender_report =
       report_block.delay_since_last_sr();
-  report_block_info->report_block.lastSR = report_block.last_sr();
+  report_block_info->report_block.last_sender_report_timestamp =
+      report_block.last_sr();
 
   int64_t rtt_ms = 0;
   uint32_t send_time_ntp = report_block.last_sr();
@@ -992,13 +992,13 @@ void RTCPReceiver::TriggerCallbacksFromRtcpPacket(
     if (stats_callback_) {
       for (const auto& report_block : packet_information.report_blocks) {
         RtcpStatistics stats;
-        stats.packets_lost = report_block.cumulativeLost;
+        stats.packets_lost = report_block.packets_lost;
         stats.extended_highest_sequence_number =
-            report_block.extendedHighSeqNum;
-        stats.fraction_lost = report_block.fractionLost;
+            report_block.extended_highest_sequence_number;
+        stats.fraction_lost = report_block.fraction_lost;
         stats.jitter = report_block.jitter;
 
-        stats_callback_->StatisticsUpdated(stats, report_block.sourceSSRC);
+        stats_callback_->StatisticsUpdated(stats, report_block.source_ssrc);
       }
     }
   }