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

Unified Diff: chromecast/renderer/media/hole_frame_factory.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format Created 5 years, 1 month 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: chromecast/renderer/media/hole_frame_factory.cc
diff --git a/chromecast/renderer/media/hole_frame_factory.cc b/chromecast/renderer/media/hole_frame_factory.cc
index cd905d2ba704b33b5a65c21f44b4ffdb224f8513..62dad087725ea5d4830e34b8a0ede07269599d5a 100644
--- a/chromecast/renderer/media/hole_frame_factory.cc
+++ b/chromecast/renderer/media/hole_frame_factory.cc
@@ -16,7 +16,7 @@ namespace media {
HoleFrameFactory::HoleFrameFactory(
::media::GpuVideoAcceleratorFactories* gpu_factories)
- : gpu_factories_(gpu_factories), texture_(0), image_id_(0), sync_point_(0) {
+ : gpu_factories_(gpu_factories), texture_(0), image_id_(0) {
if (gpu_factories_) {
scoped_ptr<::media::GpuVideoAcceleratorFactories::ScopedGLContextLock> lock(
gpu_factories_->GetGLContextLock());
@@ -32,7 +32,7 @@ HoleFrameFactory::HoleFrameFactory(
gl->GenMailboxCHROMIUM(mailbox_.name);
gl->ProduceTextureDirectCHROMIUM(texture_, GL_TEXTURE_2D, mailbox_.name);
- sync_point_ = gl->InsertSyncPointCHROMIUM();
+ sync_token_ = gpu::SyncToken(gl->InsertSyncPointCHROMIUM());
}
}
@@ -55,7 +55,7 @@ scoped_refptr<::media::VideoFrame> HoleFrameFactory::CreateHoleFrame(
scoped_refptr<::media::VideoFrame> frame =
::media::VideoFrame::WrapNativeTexture(
::media::PIXEL_FORMAT_XRGB,
- gpu::MailboxHolder(mailbox_, GL_TEXTURE_2D, sync_point_),
+ gpu::MailboxHolder(mailbox_, sync_token_, GL_TEXTURE_2D),
::media::VideoFrame::ReleaseMailboxCB(),
size, // coded_size
gfx::Rect(size), // visible rect
« no previous file with comments | « chromecast/renderer/media/hole_frame_factory.h ('k') | components/mus/public/interfaces/compositor_frame.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698