[rtp_rtcp] RtcpReceiverTest rewritten using public available interface (observers) instead intermid…

webrtc/modules/rtp_rtcp/source/rtcp_receiver.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 266 matching lines @@
   for (; it != _receivedReportBlockMap.end(); ++it) {
     const ReportBlockInfoMap* info_map = &(it->second);
     ReportBlockInfoMap::const_iterator it_info = info_map->begin();
     for (; it_info != info_map->end(); ++it_info) {
       receiveBlocks->push_back(it_info->second->remoteReceiveBlock);
     }
   }
   return 0;
 }
 
-int32_t
-RTCPReceiver::IncomingRTCPPacket(RTCPPacketInformation& rtcpPacketInformation,
-                                 RTCPUtility::RTCPParserV2* rtcpParser)
-{
+bool RTCPReceiver::IncomingPacket(const uint8_t* buffer, size_t length) {
+  // Allow receive of non-compound RTCP packets.
+  RTCPUtility::RTCPParserV2 rtcp_parser(buffer, length, true);
+
+  const bool valid_rtcpheader = rtcp_parser.IsValid();
+  if (!valid_rtcpheader) {

[philipel, 2016/02/24 11:02:01]

Replace with if(!rtcp_parser.IsValid()) and remove line 291.

[danilchap, 2016/02/24 12:53:11]

Actually yes: rtcp_parser do slightly more than validating first rtcp header. So
name is misleading.

+    LOG(LS_WARNING) << "Incoming invalid RTCP packet";
+    return false;
+  }
+  RTCPHelp::RTCPPacketInformation rtcp_packet_information;
+  IncomingRTCPPacket(rtcp_packet_information, &rtcp_parser);
+  TriggerCallbacksFromRTCPPacket(rtcp_packet_information);
+  return true;
+}
+
+void RTCPReceiver::IncomingRTCPPacket(
+    RTCPPacketInformation& rtcpPacketInformation,
+    RTCPUtility::RTCPParserV2* rtcpParser) {
     CriticalSectionScoped lock(_criticalSectionRTCPReceiver);
 
     _lastReceived = _clock->TimeInMilliseconds();
 
     if (packet_type_counter_.first_packet_time_ms == -1) {
       packet_type_counter_.first_packet_time_ms = _lastReceived;
     }
 
     RTCPUtility::RTCPPacketTypes pktType = rtcpParser->Begin();
     while (pktType != RTCPPacketTypes::kInvalid) {
@@ skipping 81 matching lines @@
     int64_t now = _clock->TimeInMilliseconds();
     if (now - last_skipped_packets_warning_ >= kMaxWarningLogIntervalMs &&
         num_skipped_packets_ > 0) {
       last_skipped_packets_warning_ = now;
       LOG(LS_WARNING)
           << num_skipped_packets_
           << " RTCP blocks were skipped due to being malformed or of "
              "unrecognized/unsupported type, during the past "
           << (kMaxWarningLogIntervalMs / 1000) << " second period.";
     }
-
-    return 0;
 }
 
 void
 RTCPReceiver::HandleSenderReceiverReport(RTCPUtility::RTCPParserV2& rtcpParser,
                                          RTCPPacketInformation& rtcpPacketInformation)
 {
     RTCPUtility::RTCPPacketTypes rtcpPacketType = rtcpParser.PacketType();
     const RTCPUtility::RTCPPacket& rtcpPacket   = rtcpParser.Packet();
 
     assert((rtcpPacketType == RTCPPacketTypes::kRr) ||
@@ skipping 1042 matching lines @@
         return -1;
       }
       num += receiveInfo->TmmbrSet.lengthOfSet();
       receiveInfoIt++;
     }
   }
   return num;
 }
 
 }  // namespace webrtc