Rename ViEReceiver and move ownership to VideoReceiveStream.

webrtc/video/rtp_stream_receiver.h

Index: webrtc/video/rtp_stream_receiver.h
diff --git a/webrtc/video/vie_receiver.h b/webrtc/video/rtp_stream_receiver.h
similarity index 84%
rename from webrtc/video/vie_receiver.h
rename to webrtc/video/rtp_stream_receiver.h
index cd7638f65e29ae9b0557ce9561daceaf7eaebcd9..26d9673ec949e0a7c44b8050b2a927216db25556 100644
--- a/webrtc/video/vie_receiver.h
+++ b/webrtc/video/rtp_stream_receiver.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_VIDEO_VIE_RECEIVER_H_
-#define WEBRTC_VIDEO_VIE_RECEIVER_H_
+#ifndef WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
+#define WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
 
 #include <list>
 #include <memory>
@@ -44,16 +44,15 @@ namespace vcm {
 class VideoReceiver;
 }  // namespace vcm
 
-class ViEReceiver : public RtpData {
+class RtpStreamReceiver : public RtpData, public RtpFeedback  {
  public:
-  ViEReceiver(vcm::VideoReceiver* video_receiver,
-              RemoteBitrateEstimator* remote_bitrate_estimator,
-              RtpFeedback* rtp_feedback,
-              Transport* transport,
-              RtcpRttStats* rtt_stats,
-              PacedSender* paced_sender,
-              PacketRouter* packet_router);
-  ~ViEReceiver();
+  RtpStreamReceiver(vcm::VideoReceiver* video_receiver,
+                    RemoteBitrateEstimator* remote_bitrate_estimator,
+                    Transport* transport,
+                    RtcpRttStats* rtt_stats,
+                    PacedSender* paced_sender,
+                    PacketRouter* packet_router);
+  ~RtpStreamReceiver();
 
   bool SetReceiveCodec(const VideoCodec& video_codec);
 
@@ -93,6 +92,16 @@ class ViEReceiver : public RtpData {
                                 const WebRtcRTPHeader* rtp_header) override;
   bool OnRecoveredPacket(const uint8_t* packet, size_t packet_length) override;
 
+  // Implements RtpFeedback.
+  int32_t OnInitializeDecoder(const int8_t payload_type,
+                              const char payload_name[RTP_PAYLOAD_NAME_SIZE],
+                              const int frequency,
+                              const size_t channels,
+                              const uint32_t rate) override;
+  void OnIncomingSSRCChanged(const uint32_t ssrc) override;
+  void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) override {}
+

[pbos-webrtc, 2016/04/28 14:26:49]

remove empty line

[mflodman, 2016/04/29 04:50:15]

Done.

+
   ReceiveStatistics* GetReceiveStatistics() const;
 
   template <class T>
@@ -169,4 +178,4 @@ class ViEReceiver : public RtpData {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_VIDEO_VIE_RECEIVER_H_
+#endif  // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_