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

webrtc/video/video_receive_stream.h

Index: webrtc/video/video_receive_stream.h
diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
index a6ee31ee42bd5351e263b8f91b4c423d33f2a6c7..19e8dc1cc882b6f47701b4b6a6bfabbc9732b59e 100644
--- a/webrtc/video/video_receive_stream.h
+++ b/webrtc/video/video_receive_stream.h
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "webrtc/base/thread_checker.h"
+#include "webrtc/call/rtp_packet_receiver.h"
 #include "webrtc/call/syncable.h"
 #include "webrtc/common_video/include/incoming_video_stream.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@@ -42,6 +43,7 @@ class VCMJitterEstimator;
 namespace internal {
 
 class VideoReceiveStream : public webrtc::VideoReceiveStream,
+                           public webrtc::RtpPacketReceiver,
                            public rtc::VideoSinkInterface<VideoFrame>,
                            public EncodedImageCallback,
                            public NackSender,
@@ -62,9 +64,6 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
 
   void SignalNetworkState(NetworkState state);
   bool DeliverRtcp(const uint8_t* packet, size_t length);
-  bool DeliverRtp(const uint8_t* packet,
-                  size_t length,
-                  const PacketTime& packet_time);
 
   bool OnRecoveredPacket(const uint8_t* packet, size_t length);
 
@@ -84,6 +83,10 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
   void EnableEncodedFrameRecording(rtc::PlatformFile file,
                                    size_t byte_limit) override;
 
+  // Implements RtpPacketReceiver
+  bool OnRtpPacket(const RtpPacketReceived& packet) override;
+  const RtpConfig& rtp_config() const override;
+
   // Implements rtc::VideoSinkInterface<VideoFrame>.
   void OnFrame(const VideoFrame& video_frame) override;