RtpPacketReceiver base class and OnRtpPacket, with a pre-parsed RTP packet.

webrtc/video/rtp_stream_receiver.h

Index: webrtc/video/rtp_stream_receiver.h
diff --git a/webrtc/video/rtp_stream_receiver.h b/webrtc/video/rtp_stream_receiver.h
index dd217899f2d7914361ae8488115cce69ccf67089..6418cd627e8ad1659e843c5741b3a17899b0f6bd 100644
--- a/webrtc/video/rtp_stream_receiver.h
+++ b/webrtc/video/rtp_stream_receiver.h
@@ -19,6 +19,7 @@
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/call/rtp_packet_receiver.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
@@ -57,6 +58,7 @@ class VideoReceiver;
 
 class RtpStreamReceiver : public RtpData,
                           public RtpFeedback,
+                          public RtpPacketReceiver,
                           public VCMFrameTypeCallback,
                           public VCMPacketRequestCallback,
                           public video_coding::OnReceivedFrameCallback,
@@ -89,9 +91,6 @@ class RtpStreamReceiver : public RtpData,
   void StartReceive();
   void StopReceive();
 
-  bool DeliverRtp(const uint8_t* rtp_packet,
-                  size_t rtp_packet_length,
-                  const PacketTime& packet_time);
   bool DeliverRtcp(const uint8_t* rtcp_packet, size_t rtcp_packet_length);
 
   void FrameContinuous(uint16_t seq_num);
@@ -100,6 +99,10 @@ class RtpStreamReceiver : public RtpData,
 
   void SignalNetworkState(NetworkState state);
 
+  // Implements RtpPacketReceiver
+  bool OnRtpPacket(const RtpPacketReceived& packet) override;
+  const RtpConfig& rtp_config() const override;
+
   // Implements RtpData.
   int32_t OnReceivedPayloadData(const uint8_t* payload_data,
                                 size_t payload_size,
@@ -160,6 +163,7 @@ class RtpStreamReceiver : public RtpData,
   Clock* const clock_;
   // Ownership of this object lies with VideoReceiveStream, which owns |this|.
   const VideoReceiveStream::Config& config_;
+  const RtpConfig rtp_config_;
   vcm::VideoReceiver* const video_receiver_;
   PacketRouter* const packet_router_;
   VieRemb* const remb_;