media/filters/mock_gpu_video_accelerator_factories.h - Issue 185403020: Make VEA client of command buffer; move sync. IPC to VDA/VEA::Initialize()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: f2a9ccb5 Rebase, posciak@ comments. 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

« content/renderer/pepper/pepper_video_capture_host.cc ('K') | « media/filters/gpu_video_decoder.cc ('k') | media/filters/mock_gpu_video_accelerator_factories.cc » ('j') | media/video/video_decode_accelerator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 2969d289d09000e13192d83981d1618faf60288b..1d018abc4421779b880cdcb6366a33cf72275a88 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;