Delete VieRemb class, move functionality to PacketRouter.

webrtc/video/video_send_stream.cc

Index: webrtc/video/video_send_stream.cc
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 5f21d57919ba5f794134603ad0b517e7abc036df..67f25c4f5e4d660773126f0c5dee9a5564121864 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -34,7 +34,6 @@
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/video/call_stats.h"
 #include "webrtc/video/payload_router.h"
-#include "webrtc/video/vie_remb.h"
 #include "webrtc/video_send_stream.h"
 
 namespace webrtc {
@@ -329,7 +328,6 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
                       RtpTransportControllerSendInterface* transport,
                       BitrateAllocator* bitrate_allocator,
                       SendDelayStats* send_delay_stats,
-                      VieRemb* remb,
                       ViEEncoder* vie_encoder,
                       RtcEventLog* event_log,
                       const VideoSendStream::Config* config,
@@ -413,7 +411,6 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
   CallStats* const call_stats_;
   RtpTransportControllerSendInterface* const transport_;
   BitrateAllocator* const bitrate_allocator_;
-  VieRemb* const remb_;
 
   // TODO(brandtr): Move ownership to PayloadRouter.
   std::unique_ptr<FlexfecSender> flexfec_sender_;
@@ -462,7 +459,6 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
                    RtpTransportControllerSendInterface* transport,
                    BitrateAllocator* bitrate_allocator,
                    SendDelayStats* send_delay_stats,
-                   VieRemb* remb,
                    RtcEventLog* event_log,
                    const VideoSendStream::Config* config,
                    int initial_encoder_max_bitrate,
@@ -475,7 +471,6 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
         transport_(transport),
         bitrate_allocator_(bitrate_allocator),
         send_delay_stats_(send_delay_stats),
-        remb_(remb),
         event_log_(event_log),
         config_(config),
         initial_encoder_max_bitrate_(initial_encoder_max_bitrate),
@@ -487,7 +482,7 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
   bool Run() override {
     send_stream_->reset(new VideoSendStreamImpl(
         stats_proxy_, rtc::TaskQueue::Current(), call_stats_, transport_,
-        bitrate_allocator_, send_delay_stats_, remb_, vie_encoder_, event_log_,
+        bitrate_allocator_, send_delay_stats_, vie_encoder_, event_log_,
         config_, initial_encoder_max_bitrate_, std::move(suspended_ssrcs_)));
     return true;
   }
@@ -500,7 +495,6 @@ class VideoSendStream::ConstructionTask : public rtc::QueuedTask {
   RtpTransportControllerSendInterface* const transport_;
   BitrateAllocator* const bitrate_allocator_;
   SendDelayStats* const send_delay_stats_;
-  VieRemb* const remb_;
   RtcEventLog* const event_log_;
   const VideoSendStream::Config* config_;
   int initial_encoder_max_bitrate_;
@@ -614,7 +608,6 @@ VideoSendStream::VideoSendStream(
     RtpTransportControllerSendInterface* transport,
     BitrateAllocator* bitrate_allocator,
     SendDelayStats* send_delay_stats,
-    VieRemb* remb,
     RtcEventLog* event_log,
     VideoSendStream::Config config,
     VideoEncoderConfig encoder_config,
@@ -632,7 +625,7 @@ VideoSendStream::VideoSendStream(
   worker_queue_->PostTask(std::unique_ptr<rtc::QueuedTask>(new ConstructionTask(
       &send_stream_, &thread_sync_event_, &stats_proxy_, vie_encoder_.get(),
       module_process_thread, call_stats, transport, bitrate_allocator,
-      send_delay_stats, remb, event_log, &config_,
+      send_delay_stats, event_log, &config_,
       encoder_config.max_bitrate_bps, suspended_ssrcs)));
 
   // Wait for ConstructionTask to complete so that |send_stream_| can be used.
@@ -747,7 +740,6 @@ VideoSendStreamImpl::VideoSendStreamImpl(
     RtpTransportControllerSendInterface* transport,
     BitrateAllocator* bitrate_allocator,
     SendDelayStats* send_delay_stats,
-    VieRemb* remb,
     ViEEncoder* vie_encoder,
     RtcEventLog* event_log,
     const VideoSendStream::Config* config,
@@ -764,7 +756,6 @@ VideoSendStreamImpl::VideoSendStreamImpl(
       call_stats_(call_stats),
       transport_(transport),
       bitrate_allocator_(bitrate_allocator),
-      remb_(remb),
       flexfec_sender_(MaybeCreateFlexfecSender(*config_)),
       max_padding_bitrate_(0),
       encoder_min_bitrate_bps_(0),
@@ -803,7 +794,6 @@ VideoSendStreamImpl::VideoSendStreamImpl(
 
   RTC_DCHECK(!config_->rtp.ssrcs.empty());
   RTC_DCHECK(call_stats_);
-  RTC_DCHECK(remb_);
   RTC_DCHECK(transport_);
   RTC_DCHECK(transport_->send_side_cc());
 
@@ -831,7 +821,6 @@ VideoSendStreamImpl::VideoSendStreamImpl(
     }
   }
 
-  remb_->AddRembSender(rtp_rtcp_modules_[0]);
   rtp_rtcp_modules_[0]->SetREMBStatus(true);
 
   ConfigureProtection();
@@ -891,8 +880,9 @@ VideoSendStreamImpl::~VideoSendStreamImpl() {
       << "VideoSendStreamImpl::Stop not called";
   LOG(LS_INFO) << "~VideoSendStreamInternal: " << config_->ToString();
 
+  // TODO(nisse): This looks pointless, since we're just about to
+  // delete the object?

[stefan-webrtc, 2017/04/03 12:31:51]

Feel free to remove in that case. The only reason I can think of where this
could make sense is if we have some other thread which may try to send REMB
while the module is being deleted.

[nisse-webrtc, 2017/04/03 14:45:02]

I'll delete then.
As far as I understand, in this case, the call to RemoveSendRtpModule
below will block until the call from the other thread is finished. So we won't
delete an object which is in use.

   rtp_rtcp_modules_[0]->SetREMBStatus(false);
-  remb_->RemoveRembSender(rtp_rtcp_modules_[0]);
 
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     transport_->packet_router()->RemoveSendRtpModule(rtp_rtcp);