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

Side by Side Diff: content/renderer/media/renderer_gpu_video_accelerator_factories.h

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: Fix mock gpu video accelerator factory 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
6 #define CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ 6 #define CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 scoped_ptr<media::VideoEncodeAccelerator> CreateVideoEncodeAccelerator() 59 scoped_ptr<media::VideoEncodeAccelerator> CreateVideoEncodeAccelerator()
60 override; 60 override;
61 // Creates textures and produces them into mailboxes. Returns true on success 61 // Creates textures and produces them into mailboxes. Returns true on success
62 // or false on failure. 62 // or false on failure.
63 bool CreateTextures(int32 count, 63 bool CreateTextures(int32 count,
64 const gfx::Size& size, 64 const gfx::Size& size,
65 std::vector<uint32>* texture_ids, 65 std::vector<uint32>* texture_ids,
66 std::vector<gpu::Mailbox>* texture_mailboxes, 66 std::vector<gpu::Mailbox>* texture_mailboxes,
67 uint32 texture_target) override; 67 uint32 texture_target) override;
68 void DeleteTexture(uint32 texture_id) override; 68 void DeleteTexture(uint32 texture_id) override;
69 void WaitSyncPoint(uint32 sync_point) override; 69 void WaitSyncPoint(uint32 sync_point,
70 const gpu::SyncToken& sync_token) override;
70 71
71 scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer( 72 scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
72 const gfx::Size& size, 73 const gfx::Size& size,
73 gfx::BufferFormat format, 74 gfx::BufferFormat format,
74 gfx::BufferUsage usage) override; 75 gfx::BufferUsage usage) override;
75 76
76 bool ShouldUseGpuMemoryBuffersForVideoFrames() const override; 77 bool ShouldUseGpuMemoryBuffersForVideoFrames() const override;
77 unsigned ImageTextureTarget() override; 78 unsigned ImageTextureTarget() override;
78 media::VideoPixelFormat VideoFrameOutputFormat() override; 79 media::VideoPixelFormat VideoFrameOutputFormat() override;
79 scoped_ptr<media::GpuVideoAcceleratorFactories::ScopedGLContextLock> 80 scoped_ptr<media::GpuVideoAcceleratorFactories::ScopedGLContextLock>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 125
125 // For sending requests to allocate shared memory in the Browser process. 126 // For sending requests to allocate shared memory in the Browser process.
126 scoped_refptr<ThreadSafeSender> thread_safe_sender_; 127 scoped_refptr<ThreadSafeSender> thread_safe_sender_;
127 128
128 DISALLOW_COPY_AND_ASSIGN(RendererGpuVideoAcceleratorFactories); 129 DISALLOW_COPY_AND_ASSIGN(RendererGpuVideoAcceleratorFactories);
129 }; 130 };
130 131
131 } // namespace content 132 } // namespace content
132 133
133 #endif // CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_ 134 #endif // CONTENT_RENDERER_MEDIA_RENDERER_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698