| 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 fa1866c12e24f3fa8fa1dc10201c4176f92c901e..fd0f53634963e086c52f249386a6c3614c328791 100644
|
| --- a/content/renderer/media/android/webmediaplayer_android.cc
|
| +++ b/content/renderer/media/android/webmediaplayer_android.cc
|
| @@ -1182,14 +1182,16 @@
|
| GLuint texture_mailbox_sync_point = gl->InsertSyncPointCHROMIUM();
|
|
|
| scoped_refptr<VideoFrame> new_frame = VideoFrame::WrapNativeTexture(
|
| - make_scoped_ptr(new gpu::MailboxHolder(texture_mailbox, texture_target,
|
| - texture_mailbox_sync_point)),
|
| + make_scoped_ptr(new gpu::MailboxHolder(
|
| + texture_mailbox, texture_target, texture_mailbox_sync_point)),
|
| media::BindToCurrentLoop(base::Bind(&OnReleaseTexture,
|
| stream_texture_factory_,
|
| remote_playback_texture_id)),
|
| - canvas_size /* coded_size */, gfx::Rect(canvas_size) /* visible_rect */,
|
| - canvas_size /* natural_size */, base::TimeDelta() /* timestamp */,
|
| - VideoFrame::ReadPixelsCB(), false /* allow overlay */);
|
| + canvas_size /* coded_size */,
|
| + gfx::Rect(canvas_size) /* visible_rect */,
|
| + canvas_size /* natural_size */,
|
| + base::TimeDelta() /* timestamp */,
|
| + VideoFrame::ReadPixelsCB());
|
| SetCurrentFrameInternal(new_frame);
|
| }
|
|
|
| @@ -1220,12 +1222,15 @@
|
| GLuint texture_mailbox_sync_point = gl->InsertSyncPointCHROMIUM();
|
|
|
| scoped_refptr<VideoFrame> new_frame = VideoFrame::WrapNativeTexture(
|
| - make_scoped_ptr(new gpu::MailboxHolder(texture_mailbox_, texture_target,
|
| - texture_mailbox_sync_point)),
|
| + make_scoped_ptr(new gpu::MailboxHolder(
|
| + texture_mailbox_, texture_target, texture_mailbox_sync_point)),
|
| media::BindToCurrentLoop(base::Bind(
|
| &OnReleaseTexture, stream_texture_factory_, texture_id_ref)),
|
| - natural_size_, gfx::Rect(natural_size_), natural_size_,
|
| - base::TimeDelta(), VideoFrame::ReadPixelsCB(), false);
|
| + natural_size_,
|
| + gfx::Rect(natural_size_),
|
| + natural_size_,
|
| + base::TimeDelta(),
|
| + VideoFrame::ReadPixelsCB());
|
| SetCurrentFrameInternal(new_frame);
|
| }
|
| }
|
|
|