content/renderer/media/android/webmediaplayer_android.cc - Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens.

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/renderer/media/android/webmediaplayer_android.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mock gpu video accelerator factory Created 5 years, 2 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

« cc/test/test_web_graphics_context_3d.h ('K') | « content/renderer/gpu/mailbox_output_surface.cc ('k') | content/renderer/media/renderer_gpu_video_accelerator_factories.h » ('j') | content/renderer/media/video_capture_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_android.cc

diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc

index 94b06224e16002627ab2b4a9ef76364dae0b9014..4a0f8b23e3f9bb369de142ee9476aaebb398e644 100644

--- a/content/renderer/media/android/webmediaplayer_android.cc

+++ b/content/renderer/media/android/webmediaplayer_android.cc

@@ -87,9 +87,10 @@ const char* kMediaEme = "Media.EME.";

void OnReleaseTexture(

const scoped_refptr<content::StreamTextureFactory>& factories,

uint32 texture_id,

- uint32 release_sync_point) {

+ uint32 release_sync_point,

+ const gpu::SyncToken& sync_token) {

GLES2Interface* gl = factories->ContextGL();

- gl->WaitSyncPointCHROMIUM(release_sync_point);

+ gl->WaitSyncPointCHROMIUM(release_sync_point, sync_token.GetConstData());

gl->DeleteTextures(1, &texture_id);

// Flush to ensure that the stream texture gets deleted in a timely fashion.

gl->ShallowFlushCHROMIUM();