Chromium Code Reviews| Index: media/renderers/mock_gpu_video_accelerator_factories.cc |
| diff --git a/media/renderers/mock_gpu_video_accelerator_factories.cc b/media/renderers/mock_gpu_video_accelerator_factories.cc |
| index 58bd5a34de7305922d0c7646097157581db251f2..637788f7c46db7d3c3c40bec9ff6e40c989f57ec 100644 |
| --- a/media/renderers/mock_gpu_video_accelerator_factories.cc |
| +++ b/media/renderers/mock_gpu_video_accelerator_factories.cc |
| @@ -12,8 +12,12 @@ namespace { |
| class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { |
| public: |
| - GpuMemoryBufferImpl(const gfx::Size& size) : size_(size) { |
| - bytes_.resize(size_.GetArea()); |
| + GpuMemoryBufferImpl(const gfx::Size& size, gfx::BufferFormat format) |
| + : format_(format), size_(size) { |
| + DCHECK(gfx::BufferFormat::R_8 == format_ || |
| + gfx::BufferFormat::UYVY_422 == format_); |
| + bytes_.resize(size_.GetArea() * |
| + (format_ == gfx::BufferFormat::UYVY_422 ? 2 : 1)); |
| } |
| // Overridden from gfx::GpuMemoryBuffer: |
| @@ -27,9 +31,13 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { |
| return false; |
| } |
| gfx::BufferFormat GetFormat() const override { |
| + NOTREACHED(); |
| return gfx::BufferFormat::R_8; |
| } |
| - void GetStride(int* stride) const override { stride[0] = size_.width(); } |
| + void GetStride(int* stride) const override { |
| + stride[0] = |
| + size_.width() * (format_ == gfx::BufferFormat::UYVY_422 ? 2 : 1); |
|
Andre
2015/08/21 18:18:36
Can we make a BytesPerElement() function and use i
|
| + } |
| gfx::GpuMemoryBufferId GetId() const override { |
| NOTREACHED(); |
| return gfx::GpuMemoryBufferId(0); |
| @@ -43,6 +51,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { |
| } |
| private: |
| + gfx::BufferFormat format_; |
| std::vector<unsigned char> bytes_; |
| const gfx::Size size_; |
| }; |
| @@ -62,8 +71,8 @@ MockGpuVideoAcceleratorFactories::AllocateGpuMemoryBuffer( |
| const gfx::Size& size, |
| gfx::BufferFormat format, |
| gfx::BufferUsage usage) { |
| - DCHECK(gfx::BufferFormat::R_8 == format); |
| - return make_scoped_ptr<gfx::GpuMemoryBuffer>(new GpuMemoryBufferImpl(size)); |
| + return make_scoped_ptr<gfx::GpuMemoryBuffer>( |
| + new GpuMemoryBufferImpl(size, format)); |
| } |
| scoped_ptr<base::SharedMemory> |