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

Unified Diff: media/filters/mock_gpu_video_accelerator_factories.h

Issue 185403020: Make VEA client of command buffer; move sync. IPC to VDA/VEA::Initialize() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 7da5b6ec Rebase. Created 6 years, 9 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/filters/gpu_video_decoder.cc ('k') | media/filters/mock_gpu_video_accelerator_factories.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/mock_gpu_video_accelerator_factories.h
diff --git a/media/filters/mock_gpu_video_accelerator_factories.h b/media/filters/mock_gpu_video_accelerator_factories.h
index 86b9a16522b008760a3ec2ab5c174a332ee9da34..fde3b08fea3fb14a28243065cee9c037719b9525 100644
--- a/media/filters/mock_gpu_video_accelerator_factories.h
+++ b/media/filters/mock_gpu_video_accelerator_factories.h
@@ -28,8 +28,7 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
// CreateVideo{Decode,Encode}Accelerator returns scoped_ptr, which the mocking
// framework does not want. Trampoline them.
- MOCK_METHOD1(DoCreateVideoDecodeAccelerator,
- VideoDecodeAccelerator*(VideoCodecProfile));
+ MOCK_METHOD0(DoCreateVideoDecodeAccelerator, VideoDecodeAccelerator*());
MOCK_METHOD0(DoCreateVideoEncodeAccelerator, VideoEncodeAccelerator*());
MOCK_METHOD5(CreateTextures,
@@ -47,8 +46,8 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
MOCK_METHOD1(CreateSharedMemory, base::SharedMemory*(size_t size));
MOCK_METHOD0(GetTaskRunner, scoped_refptr<base::SingleThreadTaskRunner>());
- virtual scoped_ptr<VideoDecodeAccelerator> CreateVideoDecodeAccelerator(
- VideoCodecProfile profile) OVERRIDE;
+ virtual scoped_ptr<VideoDecodeAccelerator> CreateVideoDecodeAccelerator()
+ OVERRIDE;
virtual scoped_ptr<VideoEncodeAccelerator> CreateVideoEncodeAccelerator()
OVERRIDE;
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/filters/mock_gpu_video_accelerator_factories.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698