commit 59cb2bd20ee76c83deb85979a3d9a255dbc55197
author danilchap <danilchap@webrtc.org> Mon Aug 29 11:08:47 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Aug 29 18:08:53 2016 +0000
tree dc329be287aa9fa8fbc670cf61321bea878e8795
parent 65fc8b9138cf49131486d3fc28b50c7ab565cabb

Adjust RtcpReceiver to be testable with callbacks:
Instead of full RtpRtcpImpl takes interface of all functions it needs from it.
Added single function for parsing packets and sending feedback, moving that
logic from RtpRtcpImpl to RtcpReceiver.

BUG=webrtc:5260

Review-Url: https://codereview.webrtc.org/2274573002
Cr-Commit-Position: refs/heads/master@{#13960}

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 9c0d66d..4d30bb0 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -20,7 +20,6 @@
 #include "webrtc/base/trace_event.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
 #include "webrtc/modules/rtp_rtcp/source/time_util.h"
 #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
 #include "webrtc/system_wrappers/include/ntp_time.h"
@@ -46,7 +45,7 @@
     RtcpBandwidthObserver* rtcp_bandwidth_observer,
     RtcpIntraFrameObserver* rtcp_intra_frame_observer,
     TransportFeedbackObserver* transport_feedback_observer,
-    ModuleRtpRtcpImpl* owner)
+    ModuleRtpRtcp* owner)
     : _clock(clock),
       receiver_only_(receiver_only),
       _lastReceived(0),
@@ -97,6 +96,20 @@
   }
 }
 
+bool RTCPReceiver::IncomingPacket(const uint8_t* packet, size_t packet_size) {
+  // Allow receive of non-compound RTCP packets.
+  RTCPUtility::RTCPParserV2 rtcp_parser(packet, packet_size, true);
+
+  if (!rtcp_parser.IsValid()) {
+    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;
+}
+
 int64_t RTCPReceiver::LastReceived() {
   rtc::CritScope lock(&_criticalSectionRTCPReceiver);
   return _lastReceived;