Move delay_based_bwe_ into CongestionController

webrtc/audio/audio_send_stream.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 68 matching lines @@
     } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) {
       channel_proxy_->EnableSendTransportSequenceNumber(extension.id);
       congestion_controller->EnablePeriodicAlrProbing(true);
       bandwidth_observer_.reset(congestion_controller->GetBitrateController()
                                     ->CreateRtcpBandwidthObserver());
     } else {
       RTC_NOTREACHED() << "Registering unsupported RTP extension.";
     }
   }
   channel_proxy_->RegisterSenderCongestionControlObjects(
-      congestion_controller->pacer(),
-      congestion_controller->GetTransportFeedbackObserver(), packet_router,
+      congestion_controller->pacer(), congestion_controller, packet_router,

[minyue-webrtc, 2017/03/02 19:53:58]

should the 2nd arg be an FeedbackAdaptor?

[elad.alon_webrtc.org, 2017/03/08 18:25:09]

As agreed with Stefan, CongestionController is now the
TransportFeedbackObserver. For now, I am passing it as a
TransportFeedbackObserver, but a later CL will (probably) change that to being
passed as a full-fledged CongestionController (rather than exposing the subset
of capabilities embodied in TransportFeedbackObserver), thereby allowing some
further cleanup.

       bandwidth_observer_.get());
   if (!SetupSendCodec()) {
     LOG(LS_ERROR) << "Failed to set up send codec state.";
   }
 }
 
 AudioSendStream::~AudioSendStream() {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   LOG(LS_INFO) << "~AudioSendStream: " << config_.ToString();
   channel_proxy_->DeRegisterExternalTransport();
@@ skipping 278 matching lines @@
         LOG(LS_WARNING) << "SetVADStatus() failed.";
         return false;
       }
     }
   }
   return true;
 }
 
 }  // namespace internal
 }  // namespace webrtc