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

Unified Diff: remoting/protocol/video_frame_pump.cc

Issue 2050353002: Update webrtc::DesktopCapturer clients to implement OnCaptureResult(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix chromeos Created 4 years, 6 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
« no previous file with comments | « remoting/protocol/video_frame_pump.h ('k') | remoting/protocol/video_frame_pump_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/video_frame_pump.cc
diff --git a/remoting/protocol/video_frame_pump.cc b/remoting/protocol/video_frame_pump.cc
index ab98abcc84048ea4d6d056e6fb4160bc965ab7c3..e2882ad7613f188d761d3860725e8ad018c5c442 100644
--- a/remoting/protocol/video_frame_pump.cc
+++ b/remoting/protocol/video_frame_pump.cc
@@ -112,7 +112,9 @@ void VideoFramePump::SetSizeCallback(const SizeCallback& size_callback) {
size_callback_ = size_callback;
}
-void VideoFramePump::OnCaptureCompleted(webrtc::DesktopFrame* frame) {
+void VideoFramePump::OnCaptureResult(
+ webrtc::DesktopCapturer::Result result,
+ std::unique_ptr<webrtc::DesktopFrame> frame) {
DCHECK(thread_checker_.CalledOnValidThread());
capture_scheduler_.OnCaptureCompleted();
@@ -137,7 +139,7 @@ void VideoFramePump::OnCaptureCompleted(webrtc::DesktopFrame* frame) {
base::PostTaskAndReplyWithResult(
encode_task_runner_.get(), FROM_HERE,
base::Bind(&VideoFramePump::EncodeFrame, encoder_.get(),
- base::Passed(base::WrapUnique(frame)),
+ base::Passed(&frame),
base::Passed(&captured_frame_timestamps_)),
base::Bind(&VideoFramePump::OnFrameEncoded, weak_factory_.GetWeakPtr()));
}
« no previous file with comments | « remoting/protocol/video_frame_pump.h ('k') | remoting/protocol/video_frame_pump_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698