Remove SendPacer from ViEEncoder

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 b0f62724ef1e9c8ee3e8624ba9e5bf242585bf99..e45a64819ccb8b343c1958c0bf3c3f622f29f646 100644
--- a/webrtc/video/vie_encoder.cc
+++ b/webrtc/video/vie_encoder.cc
@@ -79,9 +79,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,
                        PayloadRouter* payload_router,
                        EncodedImageCallback* post_encode_callback)
     : number_of_cores_(number_of_cores),
@@ -90,9 +88,7 @@ ViEEncoder::ViEEncoder(uint32_t number_of_cores,
       qm_callback_(new QMVideoSettingsCallback(vp_.get())),
       video_sender_(Clock::GetRealTimeClock(), this, this, qm_callback_.get()),
       stats_proxy_(stats_proxy),
-      pre_encode_callback_(pre_encode_callback),
       overuse_detector_(overuse_detector),
-      pacer_(pacer),
       send_payload_router_(payload_router),
       post_encode_callback_(post_encode_callback),
       time_of_last_frame_activity_ms_(0),
@@ -282,8 +278,8 @@ 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) {
+    // Too low bitrate to send data.

[stefan-webrtc, 2016/04/29 10:48:39]

I think we can remove the comment.

[perkj_webrtc, 2016/05/02 11:29:10]

Done.

     return true;
   }
   return !network_is_transmitting_;
@@ -337,10 +333,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;
@@ -486,7 +478,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;
   RTC_DCHECK(send_payload_router_);