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

Unified Diff: media/filters/gpu_video_decoder.cc

Issue 881893002: Revert of Plumb allow_overlay flag for video path into cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « media/base/video_frame_unittest.cc ('k') | media/video/picture.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/gpu_video_decoder.cc
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
index fa4577a1178fc9ed1a30fd93c509798eef63d03d..6601db88ab377f1fbc999930d125e37f5bcdb36a 100644
--- a/media/filters/gpu_video_decoder.cc
+++ b/media/filters/gpu_video_decoder.cc
@@ -450,12 +450,16 @@
scoped_refptr<VideoFrame> frame(VideoFrame::WrapNativeTexture(
make_scoped_ptr(new gpu::MailboxHolder(
pb.texture_mailbox(), decoder_texture_target_, 0 /* sync_point */)),
- BindToCurrentLoop(base::Bind(
- &GpuVideoDecoder::ReleaseMailbox, weak_factory_.GetWeakPtr(),
- factories_, picture.picture_buffer_id(), pb.texture_id())),
- pb.size(), visible_rect, natural_size, timestamp,
- base::Bind(&ReadPixelsSync, factories_, pb.texture_id(), visible_rect),
- picture.allow_overlay()));
+ BindToCurrentLoop(base::Bind(&GpuVideoDecoder::ReleaseMailbox,
+ weak_factory_.GetWeakPtr(),
+ factories_,
+ picture.picture_buffer_id(),
+ pb.texture_id())),
+ pb.size(),
+ visible_rect,
+ natural_size,
+ timestamp,
+ base::Bind(&ReadPixelsSync, factories_, pb.texture_id(), visible_rect)));
CHECK_GT(available_pictures_, 0);
--available_pictures_;
bool inserted =
« no previous file with comments | « media/base/video_frame_unittest.cc ('k') | media/video/picture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698