| 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 5f2d64d6a484f9634ea66a886aed143256dace28..5230cdde6d8df0aa199ff485d54e44194725fb2b 100644
|
| --- a/media/renderers/mock_gpu_video_accelerator_factories.cc
|
| +++ b/media/renderers/mock_gpu_video_accelerator_factories.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "media/renderers/mock_gpu_video_accelerator_factories.h"
|
|
|
| -#include "ui/gfx/buffer_format_util.h"
|
| #include "ui/gfx/gpu_memory_buffer.h"
|
|
|
| namespace media {
|
| @@ -14,23 +13,16 @@
|
| class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| public:
|
| GpuMemoryBufferImpl(const gfx::Size& size, gfx::BufferFormat format)
|
| - : format_(format), size_(size),
|
| - num_planes_(gfx::NumberOfPlanesForBufferFormat(format)) {
|
| + : format_(format), size_(size) {
|
| DCHECK(gfx::BufferFormat::R_8 == format_ ||
|
| - gfx::BufferFormat::YUV_420_BIPLANAR == format_ ||
|
| gfx::BufferFormat::UYVY_422 == format_);
|
| - DCHECK(num_planes_ <= kMaxPlanes);
|
| - for (int i = 0; i < static_cast<int>(num_planes_); ++i) {
|
| - bytes_[i].resize(
|
| - gfx::RowSizeForBufferFormat(size_.width(), format_, i) *
|
| - size_.height() / gfx::SubsamplingFactorForBufferFormat(format_, i));
|
| - }
|
| + bytes_.resize(size_.GetArea() *
|
| + (format_ == gfx::BufferFormat::UYVY_422 ? 2 : 1));
|
| }
|
|
|
| // Overridden from gfx::GpuMemoryBuffer:
|
| bool Map(void** data) override {
|
| - for (size_t plane = 0; plane < num_planes_; ++plane)
|
| - data[plane] = &bytes_[plane][0];
|
| + data[0] = &bytes_[0];
|
| return true;
|
| }
|
| void Unmap() override{};
|
| @@ -39,13 +31,12 @@
|
| return false;
|
| }
|
| gfx::BufferFormat GetFormat() const override {
|
| - return format_;
|
| + NOTREACHED();
|
| + return gfx::BufferFormat::R_8;
|
| }
|
| - void GetStride(int* strides) const override {
|
| - for (int plane = 0; plane < static_cast<int>(num_planes_); ++plane) {
|
| - strides[plane] = static_cast<int>(
|
| - gfx::RowSizeForBufferFormat(size_.width(), format_, plane));
|
| - }
|
| + void GetStride(int* stride) const override {
|
| + stride[0] =
|
| + size_.width() * (format_ == gfx::BufferFormat::UYVY_422 ? 2 : 1);
|
| }
|
| gfx::GpuMemoryBufferId GetId() const override {
|
| NOTREACHED();
|
| @@ -60,12 +51,9 @@
|
| }
|
|
|
| private:
|
| - static const size_t kMaxPlanes = 3;
|
| -
|
| gfx::BufferFormat format_;
|
| + std::vector<unsigned char> bytes_;
|
| const gfx::Size size_;
|
| - size_t num_planes_;
|
| - std::vector<uint8> bytes_[kMaxPlanes];
|
| };
|
|
|
| } // unnamed namespace
|
|
|