| Index: media/filters/mock_gpu_video_accelerator_factories.h
|
| diff --git a/media/filters/mock_gpu_video_decoder_factories.h b/media/filters/mock_gpu_video_accelerator_factories.h
|
| similarity index 55%
|
| rename from media/filters/mock_gpu_video_decoder_factories.h
|
| rename to media/filters/mock_gpu_video_accelerator_factories.h
|
| index e0ad274b66f6c1e2d97b3bb6bead9ff16ac88da2..8aa432d8cfcc5da53908882be34bb163a4b5b667 100644
|
| --- a/media/filters/mock_gpu_video_decoder_factories.h
|
| +++ b/media/filters/mock_gpu_video_accelerator_factories.h
|
| @@ -2,12 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_FILTERS_MOCK_GPU_VIDEO_DECODER_FACTORIES_H_
|
| -#define MEDIA_FILTERS_MOCK_GPU_VIDEO_DECODER_FACTORIES_H_
|
| +#ifndef MEDIA_FILTERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
|
| +#define MEDIA_FILTERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
|
|
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop_proxy.h"
|
| -#include "media/filters/gpu_video_decoder_factories.h"
|
| +#include "media/filters/gpu_video_accelerator_factories.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| +#include "media/video/video_encode_accelerator.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| @@ -20,12 +22,18 @@ class SharedMemory;
|
|
|
| namespace media {
|
|
|
| -class MockGpuVideoDecoderFactories : public GpuVideoDecoderFactories {
|
| +class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories {
|
| public:
|
| - MockGpuVideoDecoderFactories();
|
| - MOCK_METHOD2(CreateVideoDecodeAccelerator,
|
| + MockGpuVideoAcceleratorFactories();
|
| +
|
| + // CreateVideo{Decode,Encode}Accelerator returns scoped_ptr, which the mocking
|
| + // framework does not want. Trampoline them.
|
| + MOCK_METHOD2(DoCreateVideoDecodeAccelerator,
|
| VideoDecodeAccelerator*(VideoCodecProfile,
|
| VideoDecodeAccelerator::Client*));
|
| + MOCK_METHOD1(DoCreateVideoEncodeAccelerator,
|
| + VideoEncodeAccelerator*(VideoEncodeAccelerator::Client*));
|
| +
|
| MOCK_METHOD5(CreateTextures,
|
| uint32(int32 count,
|
| const gfx::Size& size,
|
| @@ -44,12 +52,19 @@ class MockGpuVideoDecoderFactories : public GpuVideoDecoderFactories {
|
| MOCK_METHOD0(Abort, void());
|
| MOCK_METHOD0(IsAborted, bool());
|
|
|
| + virtual scoped_ptr<VideoDecodeAccelerator> CreateVideoDecodeAccelerator(
|
| + VideoCodecProfile profile,
|
| + VideoDecodeAccelerator::Client* client) OVERRIDE;
|
| +
|
| + virtual scoped_ptr<VideoEncodeAccelerator> CreateVideoEncodeAccelerator(
|
| + VideoEncodeAccelerator::Client* client) OVERRIDE;
|
| +
|
| private:
|
| - virtual ~MockGpuVideoDecoderFactories();
|
| + virtual ~MockGpuVideoAcceleratorFactories();
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(MockGpuVideoDecoderFactories);
|
| + DISALLOW_COPY_AND_ASSIGN(MockGpuVideoAcceleratorFactories);
|
| };
|
|
|
| } // namespace media
|
|
|
| -#endif // MEDIA_FILTERS_MOCK_GPU_VIDEO_DECODER_FACTORIES_H_
|
| +#endif // MEDIA_FILTERS_MOCK_GPU_VIDEO_ACCELERATOR_FACTORIES_H_
|
|
|