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

Unified Diff: content/renderer/media/android/webmediaplayer_android.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 VideoFrame keep only one sync point per client 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
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 132fb9e25b708698759aa05d9d92baa82ff166fc..f23216d05fd6df2d6524a92d063509784a1d9cc6 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -72,10 +72,14 @@ const char* kMediaEme = "Media.EME.";
void OnReleaseTexture(
const scoped_refptr<content::StreamTextureFactory>& factories,
uint32 texture_id,
- const std::vector<uint32>& release_sync_points) {
+ const std::map<uintptr_t, uint32>& release_sync_points) {
GLES2Interface* gl = factories->ContextGL();
- for (size_t i = 0; i < release_sync_points.size(); i++)
- gl->WaitSyncPointCHROMIUM(release_sync_points[i]);
+ for (std::map<uintptr_t, uint32>::const_iterator iter =
+ release_sync_points.begin();
+ iter != release_sync_points.end();
+ iter++) {
+ gl->WaitSyncPointCHROMIUM(iter->second);
+ }
gl->DeleteTextures(1, &texture_id);
}
} // namespace
@@ -536,7 +540,10 @@ bool WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture(
web_graphics_context->bindTexture(GL_TEXTURE_2D, texture);
web_graphics_context->deleteTexture(source_texture);
web_graphics_context->flush();
- video_frame->AppendReleaseSyncPoint(web_graphics_context->insertSyncPoint());
+
+ video_frame->AppendReleaseSyncPoint(
+ reinterpret_cast<uintptr_t>(web_graphics_context),
+ web_graphics_context->insertSyncPoint());
dshwang 2014/06/05 14:38:30 reinterpret_cast here
return true;
}

Powered by Google App Engine
This is Rietveld 408576698