New class RtpDemuxer and RtpPacketSinkInterface, use in Call.

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 ca797e2a3e7a2a1d41d481c1f6cb90024707c3c2..6656b34963b64d7286d9087137bf08aa53e02158 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_demuxer.h"
 #include "webrtc/call/syncable.h"
 #include "webrtc/common_video/include/incoming_video_stream.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
@@ -46,7 +47,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
                            public NackSender,
                            public KeyFrameRequestSender,
                            public video_coding::OnCompleteFrameCallback,
-                           public Syncable {
+                           public Syncable,
+                           public RtpPacketSinkInterface {
  public:
   VideoReceiveStream(int num_cpu_cores,
                      PacketRouter* packet_router,
@@ -76,8 +78,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
   void EnableEncodedFrameRecording(rtc::PlatformFile file,
                                    size_t byte_limit) override;
 
-  // TODO(nisse): Intended to be part of an RtpPacketReceiver interface.
-  void OnRtpPacket(const RtpPacketReceived& packet);
+  // RtpPacketSinkInterface.
+  void OnRtpPacket(const RtpPacketReceived& packet) override;
 
   // Implements rtc::VideoSinkInterface<VideoFrame>.
   void OnFrame(const VideoFrame& video_frame) override;