Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: webrtc/video/video_send_stream.cc

Issue 1917793002: Remove SendPacer from ViEEncoder (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/video/video_send_stream.cc
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 40871af1211d7c5d94c73eea4f9fdf7cdd701995..ad3fbadd14f73bfac3e637866516ee3852646123 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -377,9 +377,7 @@ VideoSendStream::VideoSendStream(
config_.rtp.ssrcs,
module_process_thread_,
&stats_proxy_,
- config.pre_encode_callback,
&overuse_detector_,
- congestion_controller_->pacer(),
&payload_router_,
config.post_encode_callback ? &encoded_frame_proxy_ : nullptr),
video_sender_(vie_encoder_.video_sender()),
@@ -558,8 +556,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);
}

Powered by Google App Engine
This is Rietveld 408576698