remoting/host/chromeos/aura_desktop_capturer.cc - Issue 2050353002: Update webrtc::DesktopCapturer clients to implement OnCaptureResult().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/host/chromeos/aura_desktop_capturer.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 | « content/browser/media/capture/desktop_capture_device_unittest.cc ('k') | remoting/host/chromeos/aura_desktop_capturer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/host/chromeos/aura_desktop_capturer.cc

diff --git a/remoting/host/chromeos/aura_desktop_capturer.cc b/remoting/host/chromeos/aura_desktop_capturer.cc

index ee80cd2f25d679686c597059c54d991db8f5eaa4..f12a8cea1410447fc28aa66bae1bbb1d16a1be7e 100644

--- a/remoting/host/chromeos/aura_desktop_capturer.cc

+++ b/remoting/host/chromeos/aura_desktop_capturer.cc

@@ -55,7 +55,8 @@ void AuraDesktopCapturer::Capture(const webrtc::DesktopRegion&) {

void AuraDesktopCapturer::OnFrameCaptured(

std::unique_ptr<cc::CopyOutputResult> result) {

if (result->IsEmpty()) {

- callback_->OnCaptureCompleted(nullptr);

+ callback_->OnCaptureResult(DesktopCapturer::Result::ERROR_TEMPORARY,

+ nullptr);

return;

}

@@ -74,7 +75,8 @@ void AuraDesktopCapturer::OnFrameCaptured(

// See cc::Layer::contents_scale_(x|y)() and frame->set_depi().

frame->mutable_updated_region()->SetRect(rect);

- callback_->OnCaptureCompleted(frame.release());

+ callback_->OnCaptureResult(DesktopCapturer::Result::SUCCESS,

+ std::move(frame));

}

} // namespace remoting