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

Unified Diff: remoting/host/desktop_session_agent.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/host/desktop_session_agent.h ('k') | remoting/host/desktop_session_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index 628d1c92b4ab8b5116a97d2db22946baf19944fe..200c33442fd6cad53b24ef91aa31eda8da45014a 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -321,11 +321,11 @@ void DesktopSessionAgent::OnStartSessionAgent(
mouse_cursor_monitor_->Init(this, webrtc::MouseCursorMonitor::SHAPE_ONLY);
}
-void DesktopSessionAgent::OnCaptureCompleted(webrtc::DesktopFrame* frame) {
+void DesktopSessionAgent::OnCaptureResult(
+ webrtc::DesktopCapturer::Result result,
+ std::unique_ptr<webrtc::DesktopFrame> frame) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
- last_frame_.reset(frame);
-
// Serialize webrtc::DesktopFrame.
SerializedDesktopFrame serialized_frame;
if (frame) {
@@ -340,8 +340,10 @@ void DesktopSessionAgent::OnCaptureCompleted(webrtc::DesktopFrame* frame) {
}
}
+ last_frame_ = std::move(frame);
+
SendToNetwork(base::WrapUnique(
- new ChromotingDesktopNetworkMsg_CaptureCompleted(serialized_frame)));
+ new ChromotingDesktopNetworkMsg_CaptureResult(result, serialized_frame)));
}
void DesktopSessionAgent::OnMouseCursor(webrtc::MouseCursor* cursor) {
« no previous file with comments | « remoting/host/desktop_session_agent.h ('k') | remoting/host/desktop_session_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698