Reland "Remove ViEEncoder::SetNetworkStatus"

webrtc/video/vie_encoder.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 25 matching lines @@
                        OveruseFrameDetector* overuse_detector)
     : number_of_cores_(number_of_cores),
       vp_(VideoProcessing::Create()),
       video_sender_(Clock::GetRealTimeClock(), this, this, this),
       stats_proxy_(stats_proxy),
       overuse_detector_(overuse_detector),
       time_of_last_frame_activity_ms_(0),
       encoder_config_(),
       min_transmit_bitrate_bps_(0),
       last_observed_bitrate_bps_(0),
-      network_is_transmitting_(true),
       encoder_paused_(true),
       encoder_paused_and_dropped_frame_(false),
       module_process_thread_(module_process_thread),
       has_received_sli_(false),
       picture_id_sli_(0),
       has_received_rpsi_(false),
       picture_id_rpsi_(0),
       video_suspended_(false) {
   module_process_thread_->RegisterModule(&video_sender_);
   vp_->EnableTemporalDecimation(true);
 }
 
 vcm::VideoSender* ViEEncoder::video_sender() {
   return &video_sender_;
 }
 
 ViEEncoder::~ViEEncoder() {
   module_process_thread_->DeRegisterModule(&video_sender_);
 }
 
-void ViEEncoder::SetNetworkTransmissionState(bool is_transmitting) {
-  {
-    rtc::CritScope lock(&data_cs_);
-    network_is_transmitting_ = is_transmitting;
-  }
-}
-
 void ViEEncoder::Pause() {
   rtc::CritScope lock(&data_cs_);
   encoder_paused_ = true;
 }
 
 void ViEEncoder::Start() {
   rtc::CritScope lock(&data_cs_);
   encoder_paused_ = false;
 }
 
@@ skipping 108 matching lines @@
   // Padding may never exceed bitrate estimate.
   if (pad_up_to_bitrate_bps > bitrate_bps)
     pad_up_to_bitrate_bps = bitrate_bps;
 
   return pad_up_to_bitrate_bps;
 }
 
 bool ViEEncoder::EncoderPaused() const {
   // Pause video if paused by caller or as long as the network is down or the
   // pacer queue has grown too large in buffered mode.
-  if (encoder_paused_) {
-    return true;
-  }
-  if (video_suspended_ || last_observed_bitrate_bps_ == 0) {
-    return true;
-  }
-  return !network_is_transmitting_;
+  // If the pacer queue has grown to large or the network is down,
+  // last_observed_bitrate_bps_ will be 0.
+  return encoder_paused_ || video_suspended_ || last_observed_bitrate_bps_ == 0;
 }
 
 void ViEEncoder::TraceFrameDropStart() {
   // Start trace event only on the first frame after encoder is paused.
   if (!encoder_paused_and_dropped_frame_) {
     TRACE_EVENT_ASYNC_BEGIN0("webrtc", "EncoderPaused", this);
   }
   encoder_paused_and_dropped_frame_ = true;
   return;
 }
@@ skipping 142 matching lines @@
   if (!video_suspension_changed)
     return;
   // Video suspend-state changed, inform codec observer.
   LOG(LS_INFO) << "Video suspend state changed " << video_is_suspended;
 
   if (stats_proxy_)
     stats_proxy_->OnSuspendChange(video_is_suspended);
 }
 
 }  // namespace webrtc