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

Unified Diff: media/filters/gpu_video_decoder.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Folded sync_point into sync_tokens Created 5 years, 2 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: media/filters/gpu_video_decoder.cc
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
index 18f4a1843f82210d7b5da10d61877c43045908f1..8c5ca9031a1af3d3da57d8e56a14dea8927d328c 100644
--- a/media/filters/gpu_video_decoder.cc
+++ b/media/filters/gpu_video_decoder.cc
@@ -410,8 +410,8 @@ void GpuVideoDecoder::PictureReady(const media::Picture& picture) {
scoped_refptr<VideoFrame> frame(VideoFrame::WrapNativeTexture(
PIXEL_FORMAT_ARGB,
- gpu::MailboxHolder(pb.texture_mailbox(), decoder_texture_target_,
- 0 /* sync_point */),
+ gpu::MailboxHolder(pb.texture_mailbox(), gpu::SyncToken(),
+ decoder_texture_target_),
BindToCurrentLoop(base::Bind(
&GpuVideoDecoder::ReleaseMailbox, weak_factory_.GetWeakPtr(),
factories_, picture.picture_buffer_id(), pb.texture_id())),
@@ -452,9 +452,9 @@ void GpuVideoDecoder::ReleaseMailbox(
media::GpuVideoAcceleratorFactories* factories,
int64 picture_buffer_id,
uint32 texture_id,
- uint32 release_sync_point) {
+ const gpu::SyncToken& release_sync_token) {
DCHECK(factories->GetTaskRunner()->BelongsToCurrentThread());
- factories->WaitSyncPoint(release_sync_point);
+ factories->WaitSyncToken(release_sync_token);
if (decoder) {
decoder->ReusePictureBuffer(picture_buffer_id);

Powered by Google App Engine
This is Rietveld 408576698