| Index: content/renderer/media/rtc_video_decoder.cc
|
| diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc
|
| index 8caf401b3606b969c564ccb444cf296dcca94820..0b3f0beaad76486b9669df4db7136671a10b1e60 100644
|
| --- a/content/renderer/media/rtc_video_decoder.cc
|
| +++ b/content/renderer/media/rtc_video_decoder.cc
|
| @@ -419,7 +419,8 @@ scoped_refptr<media::VideoFrame> RTCVideoDecoder::CreateVideoFrame(
|
| // correct format is used and everyone down the line understands it.
|
| scoped_refptr<media::VideoFrame> frame(media::VideoFrame::WrapNativeTexture(
|
| media::PIXEL_FORMAT_ARGB,
|
| - gpu::MailboxHolder(pb.texture_mailbox(), decoder_texture_target_, 0),
|
| + gpu::MailboxHolder(pb.texture_mailbox(), 0, gpu::SyncToken(),
|
| + decoder_texture_target_),
|
| media::BindToCurrentLoop(base::Bind(
|
| &RTCVideoDecoder::ReleaseMailbox, weak_factory_.GetWeakPtr(),
|
| factories_, picture.picture_buffer_id(), pb.texture_id())),
|
| @@ -624,9 +625,10 @@ void RTCVideoDecoder::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);
|
|
|