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

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

Issue 806413004: Plumb allow_overlay flag for video path into cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed v4l2 Created 5 years, 11 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: 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 fd0f53634963e086c52f249386a6c3614c328791..fa1866c12e24f3fa8fa1dc10201c4176f92c901e 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -1182,16 +1182,14 @@ void WebMediaPlayerAndroid::DrawRemotePlaybackText(
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());
+ canvas_size /* coded_size */, gfx::Rect(canvas_size) /* visible_rect */,
+ canvas_size /* natural_size */, base::TimeDelta() /* timestamp */,
+ VideoFrame::ReadPixelsCB(), false /* allow overlay */);
SetCurrentFrameInternal(new_frame);
}
@@ -1222,15 +1220,12 @@ void WebMediaPlayerAndroid::ReallocateVideoFrame() {
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());
+ natural_size_, gfx::Rect(natural_size_), natural_size_,
+ base::TimeDelta(), VideoFrame::ReadPixelsCB(), false);
SetCurrentFrameInternal(new_frame);
}
}
« no previous file with comments | « content/common/gpu/media/vt_video_decode_accelerator.cc ('k') | content/renderer/media/rtc_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698