content/renderer/media/android/webmediaplayer_android.cc - Issue 175223003: HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl

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 175223003: HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl (Closed) Base URL: https://git.chromium.org/chromium/src.git@master

Patch Set: Focus on this CL's goal and remove wrong change Created 6 years, 9 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

« content/browser/renderer_host/media/video_capture_controller_unittest.cc ('K') | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/rtc_video_decoder.h » ('j') | content/renderer/media/webmediaplayer_impl.cc » ('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 3679178aa734665867750888714ab653f7a2d055..b3a67926cc9961b7b9d175860ac0272f00f77c1c 100644

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

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

@@ -1418,14 +1418,14 @@ void WebMediaPlayerAndroid::SetDecryptorReadyCB(

}

void WebMediaPlayerAndroid::DoReleaseRemotePlaybackTexture(

- scoped_ptr<gpu::MailboxHolder> mailbox_holder) {

+ const std::vector<uint32>& release_sync_points) {

DCHECK(main_thread_checker_.CalledOnValidThread());

DCHECK(remote_playback_texture_id_);

GLES2Interface* gl = stream_texture_factory_->ContextGL();

- if (mailbox_holder->sync_point)

- gl->WaitSyncPointCHROMIUM(mailbox_holder->sync_point);

+ for (size_t i = 0; i < release_sync_points.size(); i++)

+ gl->WaitSyncPointCHROMIUM(release_sync_points[i]);

gl->DeleteTextures(1, &remote_playback_texture_id_);

remote_playback_texture_id_ = 0;

}