| 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..57a1261c51df0ecd12217ce1b492ce9d90bed5c3 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(), 0, gpu::SyncToken(),
|
| + decoder_texture_target_),
|
| BindToCurrentLoop(base::Bind(
|
| &GpuVideoDecoder::ReleaseMailbox, weak_factory_.GetWeakPtr(),
|
| factories_, picture.picture_buffer_id(), pb.texture_id())),
|
| @@ -452,9 +452,10 @@ void GpuVideoDecoder::ReleaseMailbox(
|
| media::GpuVideoAcceleratorFactories* factories,
|
| int64 picture_buffer_id,
|
| uint32 texture_id,
|
| - uint32 release_sync_point) {
|
| + uint32 release_sync_point,
|
| + const gpu::SyncToken& release_sync_token) {
|
| DCHECK(factories->GetTaskRunner()->BelongsToCurrentThread());
|
| - factories->WaitSyncPoint(release_sync_point);
|
| + factories->WaitSyncPoint(release_sync_point, release_sync_token);
|
|
|
| if (decoder) {
|
| decoder->ReusePictureBuffer(picture_buffer_id);
|
|
|