Remove ViEEncoder::SetNetworkStatus

webrtc/modules/pacing/paced_sender.cc

 /*
  *  Copyright (c) 2012 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 275 matching lines @@
 
 void PacedSender::SetMinimumSendBitrate(int bitrate_bps) {
   CriticalSectionScoped cs(critsect_.get());
   min_send_bitrate_kbps_ = bitrate_bps / 1000;
   target_bitrate_kbps_ =
       std::max(min_send_bitrate_kbps_, estimated_bitrate_bps_ / 1000) *
       kDefaultPaceMultiplier;
 }
 
 void PacedSender::SetNetWorkEstimateTargetBitrate(uint32_t bitrate_bps) {
-  LOG(LS_INFO) << "SetNetWorkEstimateTargetBitrate, bitrate " << bitrate_bps;
+  LOG(LS_VERBOSE) << "SetNetWorkEstimateTargetBitrate, bitrate " << bitrate_bps;
 
   CriticalSectionScoped cs(critsect_.get());
   estimated_bitrate_bps_ = bitrate_bps;
   target_bitrate_kbps_ =
       std::max(min_send_bitrate_kbps_, estimated_bitrate_bps_ / 1000) *
       kDefaultPaceMultiplier;
 }
 
 void PacedSender::SetPaddingBitrate(int bitrate_bps) {
   CriticalSectionScoped cs(critsect_.get());
@@ skipping 14 matching lines @@
   prober_->OnIncomingPacket(estimated_bitrate_bps_, bytes, now_ms);
 
   if (capture_time_ms < 0)
     capture_time_ms = now_ms;
 
   packets_->Push(paced_sender::Packet(priority, ssrc, sequence_number,
                                       capture_time_ms, now_ms, bytes,
                                       retransmission, packet_counter_++));
 }
 
+bool PacedSender::CanSendMorePackets() const {
+  CriticalSectionScoped cs(critsect_.get());
+  return !paused_ && ExpectedQueueTimeMs() < PacedSender::kMaxQueueLengthMs;

[stefan-webrtc, 2016/05/02 10:56:30]

This method takes the lock twice, once on line 332 and once on line 337.

+}
+
 int64_t PacedSender::ExpectedQueueTimeMs() const {
   CriticalSectionScoped cs(critsect_.get());
   RTC_DCHECK_GT(target_bitrate_kbps_, 0u);
   return static_cast<int64_t>(packets_->SizeInBytes() * 8 /
                               target_bitrate_kbps_);
 }
 
 size_t PacedSender::QueueSizePackets() const {
   CriticalSectionScoped cs(critsect_.get());
   return packets_->SizeInPackets();
@@ skipping 126 matching lines @@
     media_budget_->UseBudget(bytes_sent);
     padding_budget_->UseBudget(bytes_sent);
   }
 }
 
 void PacedSender::UpdateBytesPerInterval(int64_t delta_time_ms) {
   media_budget_->IncreaseBudget(delta_time_ms);
   padding_budget_->IncreaseBudget(delta_time_ms);
 }
 }  // namespace webrtc