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

webrtc/video/video_send_stream.cc

Index: webrtc/video/video_send_stream.cc
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index f27a858a27d37b797233bc8284fbdece7a5f0108..9ffe8a34c07f1139d19a4337f9894cc36507aa48 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -379,9 +379,7 @@ VideoSendStream::VideoSendStream(
                    config_.rtp.ssrcs,
                    module_process_thread_,
                    &stats_proxy_,
-                   config.pre_encode_callback,
-                   &overuse_detector_,
-                   congestion_controller_->pacer()),
+                   &overuse_detector_),
       video_sender_(vie_encoder_.video_sender()),
       bandwidth_observer_(congestion_controller_->GetBitrateController()
                               ->CreateRtcpBandwidthObserver()),
@@ -581,8 +579,14 @@ void VideoSendStream::EncoderProcess() {
     }
 
     VideoFrame frame;
-    if (input_.GetVideoFrame(&frame))
+    if (input_.GetVideoFrame(&frame)) {
+      // TODO(perkj): |pre_encode_callback| is only used by tests. Tests should
+      // register as a sink to the VideoSource instead.
+      if (config_.pre_encode_callback) {
+        config_.pre_encode_callback->OnFrame(frame);
+      }
       vie_encoder_.EncodeVideoFrame(frame);
+    }
   }
   vie_encoder_.DeRegisterExternalEncoder(config_.encoder_settings.payload_type);
 }