Index: webrtc/video/video_send_stream.cc |
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc |
index 84eb836243633e19cbbf8b3c4281c7f77b1a7797..840991b4baceadf16fe026bd02915d816aa84da8 100644 |
--- a/webrtc/video/video_send_stream.cc |
+++ b/webrtc/video/video_send_stream.cc |
@@ -379,9 +379,7 @@ VideoSendStream::VideoSendStream( |
vie_encoder_(num_cpu_cores, |
module_process_thread_, |
&stats_proxy_, |
- config.pre_encode_callback, |
- &overuse_detector_, |
- congestion_controller_->pacer()), |
+ &overuse_detector_), |
encoder_feedback_(Clock::GetRealTimeClock(), |
config.rtp.ssrcs, |
&vie_encoder_), |
@@ -590,8 +588,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); |
} |