Initial implementation of RtpTransportControllerReceive and related interfaces.

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 42fa30eed0dcc99a9d7fd3560904c6335ce76e3e..8d29e73436e45e86e8a482d92708aed0a53ce6b5 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_transport_controller_receive.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"
@@ -58,6 +59,7 @@ class VideoReceiver;
 
 class RtpStreamReceiver : public RtpData,
                           public RtpFeedback,
+                          public RtpPacketReceiverInterface,
                           public VCMFrameTypeCallback,
                           public VCMPacketRequestCallback,
                           public video_coding::OnReceivedFrameCallback,
@@ -97,8 +99,8 @@ class RtpStreamReceiver : public RtpData,
 
   void SignalNetworkState(NetworkState state);
 
-  // TODO(nisse): Intended to be part of an RtpPacketReceiver interface.
-  void OnRtpPacket(const RtpPacketReceived& packet);
+  // RtpPacketReceiverInterface implementation.
+  bool OnRtpPacketReceive(RtpPacketReceived* packet) override;
 
   // Implements RtpData.
   int32_t OnReceivedPayloadData(const uint8_t* payload_data,
@@ -152,7 +154,6 @@ class RtpStreamReceiver : public RtpData,
   bool IsPacketInOrder(const RTPHeader& header) const;
   bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
   void UpdateHistograms();
-  void EnableReceiveRtpHeaderExtension(const std::string& extension, int id);
   bool IsRedEnabled() const;
   void InsertSpsPpsIntoTracker(uint8_t payload_type);
 
@@ -166,7 +167,7 @@ class RtpStreamReceiver : public RtpData,
   RemoteNtpTimeEstimator ntp_estimator_;
   RTPPayloadRegistry rtp_payload_registry_;
 
-  const std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
+  RtpHeaderExtensionMap rtp_header_extensions_;
   const std::unique_ptr<RtpReceiver> rtp_receiver_;
   const std::unique_ptr<ReceiveStatistics> rtp_receive_statistics_;
   std::unique_ptr<UlpfecReceiver> ulpfec_receiver_;