content/browser/media/capture/desktop_capture_device_aura.cc - Issue 312803002: Android media: VideoFrame should not store so many sync points.

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: content/browser/media/capture/desktop_capture_device_aura.cc

Issue 312803002: Android media: VideoFrame should not store so many sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make content_unittests pass on Android Created 6 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 | « cc/resources/video_resource_updater.cc ('k') | content/browser/renderer_host/image_transport_factory_android.h » ('j') | content/browser/renderer_host/image_transport_factory_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/desktop_capture_device_aura.cc

diff --git a/content/browser/media/capture/desktop_capture_device_aura.cc b/content/browser/media/capture/desktop_capture_device_aura.cc

index 08aec1eba2e6976f0c02edad56aefe0dfde5abe8..7e3ad28b0d2fb453181688e74fc5feb340141683 100644

--- a/content/browser/media/capture/desktop_capture_device_aura.cc

+++ b/content/browser/media/capture/desktop_capture_device_aura.cc

@@ -296,14 +296,9 @@ void CopyOutputFinishedForVideo(

}

void RunSingleReleaseCallback(scoped_ptr<cc::SingleReleaseCallback> cb,

- const std::vector<uint32>& sync_points) {

+ uint32 sync_point) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- GLHelper* gl_helper = ImageTransportFactory::GetInstance()->GetGLHelper();

- DCHECK(gl_helper);

- for (unsigned i = 0; i < sync_points.size(); i++)

- gl_helper->WaitSyncPoint(sync_points[i]);

- uint32 new_sync_point = gl_helper->InsertSyncPoint();

- cb->Run(new_sync_point, false);

+ cb->Run(sync_point, false);

}

void DesktopVideoCaptureMachine::DidCopyOutput(