rtcp::ReportBlock refactored to contain parsing

webrtc/modules/rtp_rtcp/source/rtcp_sender.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 441 matching lines @@
 }
 
 int32_t RTCPSender::AddReportBlock(const RTCPReportBlock& report_block) {
   if (report_blocks_.size() >= RTCP_MAX_REPORT_BLOCKS) {
     LOG(LS_WARNING) << "Too many report blocks.";
     return -1;
   }
   rtcp::ReportBlock* block = &report_blocks_[report_block.remoteSSRC];
   block->To(report_block.remoteSSRC);
   block->WithFractionLost(report_block.fractionLost);
-  block->WithCumulativeLost(report_block.cumulativeLost);
+  if (!block->WithCumulativeLost(report_block.cumulativeLost)) {
+    LOG(LS_WARNING) << "Cumulative lost is oversized.";
+    return -1;
+  }
   block->WithExtHighestSeqNum(report_block.extendedHighSeqNum);
   block->WithJitter(report_block.jitter);
   block->WithLastSr(report_block.lastSR);
   block->WithDelayLastSr(report_block.delaySinceLastSR);
 
   return 0;
 }
 
 RTCPSender::BuildResult RTCPSender::BuildSR(RtcpContext* ctx) {
   for (int i = (RTCP_NUMBER_OF_SR - 2); i >= 0; i--) {
@@ skipping 544 matching lines @@
     }
     next_time_to_send_rtcp_ = clock_->TimeInMilliseconds() + timeToNext;
 
     StatisticianMap statisticians =
         receive_statistics_->GetActiveStatisticians();
     if (!statisticians.empty()) {
       for (auto it = statisticians.begin(); it != statisticians.end(); ++it) {
         RTCPReportBlock report_block;
         if (PrepareReport(feedback_state, it->first, it->second,
                           &report_block)) {
+          // TODO(danilchap) AddReportBlock may fail (for 2 different reasons).
+          // Probably it shouldn't be ignored.
           AddReportBlock(report_block);
         }
       }
     }
   }
 
   auto it = report_flags_.begin();
   while (it != report_flags_.end()) {
     auto builder = builders_.find(it->type);
     RTC_DCHECK(builder != builders_.end());
@@ skipping 177 matching lines @@
     Transport* const transport_;
     bool send_failure_;
   } sender(transport_);
 
   uint8_t buffer[IP_PACKET_SIZE];
   return packet.BuildExternalBuffer(buffer, IP_PACKET_SIZE, &sender) &&
          !sender.send_failure_;
 }
 
 }  // namespace webrtc