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

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1429213002: Converted video frame and image callbacks to use new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed typo Created 5 years, 1 month 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
« no previous file with comments | « content/common/gpu/gpu_messages.h ('k') | content/renderer/media/video_capture_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 e7325150d116abb22f293c4c9aac011d85d1ca56..ceecc0809b3085e699c344df172e5bbee3cb611f 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -136,11 +136,10 @@ class SyncTokenClientImpl : public media::VideoFrame::SyncTokenClient {
blink::WebGraphicsContext3D* web_graphics_context)
: web_graphics_context_(web_graphics_context) {}
~SyncTokenClientImpl() override {}
- uint32 InsertSyncPoint() override {
- gpu::SyncToken sync_token;
- if (!web_graphics_context_->insertSyncPoint(sync_token.GetData()))
- return 0;
- return static_cast<uint32>(sync_token.release_count());
+ void GenerateSyncToken(gpu::SyncToken* sync_token) override {
+ if (!web_graphics_context_->insertSyncPoint(sync_token->GetData())) {
+ sync_token->Clear();
+ }
}
void WaitSyncToken(const gpu::SyncToken& sync_token) override {
web_graphics_context_->waitSyncToken(sync_token.GetConstData());
« no previous file with comments | « content/common/gpu/gpu_messages.h ('k') | content/renderer/media/video_capture_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698