Move ownership of receive ViEChannel to VideoReceiveStream.

webrtc/video/video_send_stream.cc

 /*
  *  Copyright (c) 2013 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 132 matching lines @@
       channel_id, num_cpu_cores, module_process_thread_, &stats_proxy_,
       config.pre_encode_callback, channel_group_->pacer(),
       channel_group_->bitrate_allocator()));
   RTC_CHECK(vie_encoder_->Init());
 
   vie_channel_.reset(new ViEChannel(
       num_cpu_cores, config.send_transport, module_process_thread_,
       channel_group_->GetRtcpIntraFrameObserver(),
       channel_group_->GetBitrateController()->CreateRtcpBandwidthObserver(),
       transport_feedback_observer,
-      channel_group_->GetRemoteBitrateEstimator(),
+      channel_group_->GetRemoteBitrateEstimator(false),
       channel_group_->GetCallStats()->rtcp_rtt_stats(), channel_group_->pacer(),
       channel_group_->packet_router(), ssrcs.size(), true));
   RTC_CHECK(vie_channel_->Init() == 0);
 
   vie_encoder_->StartThreadsAndSetSharedMembers(
       vie_channel_->send_payload_router(),
       vie_channel_->vcm_protection_callback());
 
   std::vector<uint32_t> first_ssrc(1, ssrcs[0]);
   vie_encoder_->SetSsrcs(first_ssrc);
@@ skipping 87 matching lines @@
   channel_group_->GetCallStats()->DeregisterStatsObserver(
       vie_channel_->GetStatsObserver());
   channel_group_->SetChannelRembStatus(false, false, vie_channel_.get());
 
   // Remove the feedback, stop all encoding threads and processing. This must be
   // done before deleting the channel.
   channel_group_->RemoveEncoder(vie_encoder_.get());
   vie_encoder_->StopThreadsAndRemoveSharedMembers();
 
   uint32_t remote_ssrc = vie_channel_->GetRemoteSSRC();
-  channel_group_->GetRemoteBitrateEstimator()->RemoveStream(remote_ssrc);
+  channel_group_->GetRemoteBitrateEstimator(false)->RemoveStream(remote_ssrc);
 }
 
 VideoCaptureInput* VideoSendStream::Input() {
   return input_.get();
 }
 
 void VideoSendStream::Start() {
   transport_adapter_.Enable();
   vie_encoder_->Pause();
   if (vie_channel_->StartSend() == 0) {
@@ skipping 275 matching lines @@
                                        vie_channel_->IsSendingFecEnabled());
 
   // Restart the media flow
   vie_encoder_->Restart();
 
   return true;
 }
 
 }  // namespace internal
 }  // namespace webrtc