Chromium Code Reviews| 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; |
| } |