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

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: Make GpuVideoAcceleratorFactories::ReadPixels() receive mailbox, instead of texture 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
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 9a87ecfd7175e353fd1b0e1d0d912136beb01fc0..bc7705cfd93d0baa2e27f5aa42ccde3fe161ca5c 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -69,12 +69,13 @@ namespace content {
void WebMediaPlayerAndroid::OnReleaseRemotePlaybackTexture(
const scoped_refptr<base::MessageLoopProxy>& main_loop,
const base::WeakPtr<WebMediaPlayerAndroid>& player,
- scoped_ptr<gpu::MailboxHolder> mailbox_holder) {
+ scoped_ptr<gpu::MailboxHolder> mailbox_holder,
+ const std::vector<uint32>& release_sync_points) {
main_loop->PostTask(
FROM_HERE,
base::Bind(&WebMediaPlayerAndroid::DoReleaseRemotePlaybackTexture,
player,
- mailbox_holder->sync_point));
+ release_sync_points));
}
WebMediaPlayerAndroid::WebMediaPlayerAndroid(
@@ -1421,14 +1422,15 @@ void WebMediaPlayerAndroid::SetDecryptorReadyCB(
decryptor_ready_cb_ = decryptor_ready_cb;
}
-void WebMediaPlayerAndroid::DoReleaseRemotePlaybackTexture(uint32 sync_point) {
+void WebMediaPlayerAndroid::DoReleaseRemotePlaybackTexture(
+ const std::vector<uint32>& release_sync_points) {
DCHECK(main_thread_checker_.CalledOnValidThread());
DCHECK(remote_playback_texture_id_);
GLES2Interface* gl = stream_texture_factory_->ContextGL();
- if (sync_point)
- gl->WaitSyncPointCHROMIUM(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;
}

Powered by Google App Engine
This is Rietveld 408576698