Remove ViEEncoder::SetNetworkStatus

webrtc/modules/pacing/paced_sender.cc

Index: webrtc/modules/pacing/paced_sender.cc
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc
index 2f556bb4ab64f0bcc544f0f6bf97cf9b7f3fe972..048f3b11699f8224872ed35633192db0b5033754 100644
--- a/webrtc/modules/pacing/paced_sender.cc
+++ b/webrtc/modules/pacing/paced_sender.cc
@@ -293,7 +293,7 @@ void PacedSender::SetMinimumSendBitrate(int bitrate_bps) {
 }
 
 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;
@@ -328,6 +328,11 @@ void PacedSender::InsertPacket(RtpPacketSender::Priority priority,
                                       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);