Reland of Remove SendPacer from ViEEncoder (patchset #13 id:240001 of https://codereview.we…

webrtc/video/vie_encoder.cc

Index: webrtc/video/vie_encoder.cc
diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
index 79b79d97269c8199e43ffc0723b4ea92c2034f35..91fc1f0db21ad80a32868185fcfba8273376f2c0 100644
--- a/webrtc/video/vie_encoder.cc
+++ b/webrtc/video/vie_encoder.cc
@@ -57,9 +57,7 @@ ViEEncoder::ViEEncoder(uint32_t number_of_cores,
                        const std::vector<uint32_t>& ssrcs,
                        ProcessThread* module_process_thread,
                        SendStatisticsProxy* stats_proxy,
-                       rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
-                       OveruseFrameDetector* overuse_detector,
-                       PacedSender* pacer)
+                       OveruseFrameDetector* overuse_detector)
     : number_of_cores_(number_of_cores),
       ssrcs_(ssrcs),
       vp_(VideoProcessing::Create()),
@@ -70,9 +68,7 @@ ViEEncoder::ViEEncoder(uint32_t number_of_cores,
                     qm_callback_.get(),
                     this),
       stats_proxy_(stats_proxy),
-      pre_encode_callback_(pre_encode_callback),
       overuse_detector_(overuse_detector),
-      pacer_(pacer),
       time_of_last_frame_activity_ms_(0),
       encoder_config_(),
       min_transmit_bitrate_bps_(0),
@@ -245,8 +241,7 @@ bool ViEEncoder::EncoderPaused() const {
   if (encoder_paused_) {
     return true;
   }
-  if (pacer_->ExpectedQueueTimeMs() > PacedSender::kMaxQueueLengthMs) {
-    // Too much data in pacer queue, drop frame.
+  if (video_suspended_ || last_observed_bitrate_bps_ == 0) {
     return true;
   }
   return !network_is_transmitting_;
@@ -295,10 +290,6 @@ void ViEEncoder::EncodeVideoFrame(const VideoFrame& video_frame) {
     }
   }
 
-  if (pre_encode_callback_) {
-    pre_encode_callback_->OnFrame(*frame_to_send);
-  }
-
   if (codec_type == webrtc::kVideoCodecVP8) {
     webrtc::CodecSpecificInfo codec_specific_info;
     codec_specific_info.codecType = webrtc::kVideoCodecVP8;
@@ -435,7 +426,7 @@ void ViEEncoder::OnReceivedIntraFrameRequest(uint32_t ssrc) {
 void ViEEncoder::OnBitrateUpdated(uint32_t bitrate_bps,
                                   uint8_t fraction_lost,
                                   int64_t round_trip_time_ms) {
-  LOG(LS_VERBOSE) << "OnBitrateUpdated, bitrate" << bitrate_bps
+  LOG(LS_VERBOSE) << "OnBitrateUpdated, bitrate " << bitrate_bps
                   << " packet loss " << static_cast<int>(fraction_lost)
                   << " rtt " << round_trip_time_ms;
   video_sender_.SetChannelParameters(bitrate_bps, fraction_lost,