Delete VieRemb class, move functionality to PacketRouter.

webrtc/video/rtp_stream_receiver.cc

Index: webrtc/video/rtp_stream_receiver.cc
diff --git a/webrtc/video/rtp_stream_receiver.cc b/webrtc/video/rtp_stream_receiver.cc
index 90dd0da0e1cda44c4e130aa6ef55fef9303f7b9b..8516eb966f434a87506ebf69de22a072d82b348c 100644
--- a/webrtc/video/rtp_stream_receiver.cc
+++ b/webrtc/video/rtp_stream_receiver.cc
@@ -38,7 +38,6 @@
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/system_wrappers/include/timestamp_extrapolator.h"
 #include "webrtc/video/receive_statistics_proxy.h"
-#include "webrtc/video/vie_remb.h"
 
 namespace webrtc {
 
@@ -83,7 +82,6 @@ RtpStreamReceiver::RtpStreamReceiver(
     Transport* transport,
     RtcpRttStats* rtt_stats,
     PacketRouter* packet_router,
-    VieRemb* remb,
     const VideoReceiveStream::Config* config,
     ReceiveStatisticsProxy* receive_stats_proxy,
     ProcessThread* process_thread,
@@ -94,7 +92,6 @@ RtpStreamReceiver::RtpStreamReceiver(
     : clock_(Clock::GetRealTimeClock()),
       config_(*config),
       packet_router_(packet_router),
-      remb_(remb),
       process_thread_(process_thread),
       ntp_estimator_(clock_),
       rtp_header_parser_(RtpHeaderParser::Create()),
@@ -132,7 +129,6 @@ RtpStreamReceiver::RtpStreamReceiver(
   rtp_rtcp_->SetKeyFrameRequestMethod(kKeyFrameReqPliRtcp);
   if (config_.rtp.remb) {

[nisse-webrtc, 2017/04/04 12:31:46]

Can I delete the config_.rtp.remb flag? Not sure how configuration should work,
with this cl, we'll send REMB info if and only if OnReceiveBitrateChanged is
called, which depends on the estimators fed by the receive side congestion
controller.

[danilchap, 2017/04/07 07:37:40]

Since you now control remb in PacketRouter, this flag/block likely can be
removed.

In perfect world I guess this flag should be pass to packet router, that
shouldn't then try to send remb when it is not configured to avoid wasting few
bytes per rtcp packet.

[nisse-webrtc, 2017/04/07 08:21:44]

I'll try deleting it then, we can add configurability in PacketRouter if we ever
need it.

[nisse-webrtc, 2017/04/07 08:32:18]

What about this HasRemb method?

https://cs.chromium.org/chromium/src/third_party/webrtc/media/base/codec.cc?t...

If I delete the only place reading VideoReceiveStream::Config::Rtp::remb, it
would be good to also delete all code related to writing that setting.

[nisse-webrtc, 2017/04/07 09:14:31]

I'll leave the code setting config.rtp.remb for now, just adding a TODO
explaining that it is currently ignored.

     rtp_rtcp_->SetREMBStatus(true);
-    remb_->AddReceiveChannel(rtp_rtcp_.get());
   }
 
   for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) {
@@ -204,9 +200,6 @@ RtpStreamReceiver::~RtpStreamReceiver() {
 
   packet_router_->RemoveReceiveRtpModule(rtp_rtcp_.get());
   rtp_rtcp_->SetREMBStatus(false);
-  if (config_.rtp.remb) {
-    remb_->RemoveReceiveChannel(rtp_rtcp_.get());
-  }
   UpdateHistograms();
 }