diff options
author | andresantoso <andresantoso@chromium.org> | 2015-08-12 11:11:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-12 18:12:00 +0000 |
commit | 42febcc1b22c086482951ae830e2e3f785882dfc (patch) | |
tree | 5ff6f4ef8692286049ca2c376ffb9e504cceffcd /cc | |
parent | f768a19437cfcee351469c104c442bc2be14b6fe (diff) | |
download | chromium_src-42febcc1b22c086482951ae830e2e3f785882dfc.zip chromium_src-42febcc1b22c086482951ae830e2e3f785882dfc.tar.gz chromium_src-42febcc1b22c086482951ae830e2e3f785882dfc.tar.bz2 |
Move NumberOfPlanesForGpuMemoryBufferFormat to gfx
We will need to call it from media::GpuMemoryBufferVideoFramePool when we
add support for YUV_420_BIPLANAR.
BUG=510260
TEST=No behavior change, only moving code.
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Committed: https://crrev.com/85f29861d095a7c5dcf318053e8349d1efaddbab
Cr-Commit-Position: refs/heads/master@{#342942}
Review URL: https://codereview.chromium.org/1281043006
Cr-Commit-Position: refs/heads/master@{#343053}
Diffstat (limited to 'cc')
-rw-r--r-- | cc/test/test_gpu_memory_buffer_manager.cc | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc index d70b740..dbc9077 100644 --- a/cc/test/test_gpu_memory_buffer_manager.cc +++ b/cc/test/test_gpu_memory_buffer_manager.cc @@ -6,31 +6,12 @@ #include "base/logging.h" #include "base/numerics/safe_conversions.h" +#include "ui/gfx/buffer_format_util.h" #include "ui/gfx/gpu_memory_buffer.h" namespace cc { namespace { -int NumberOfPlanesForGpuMemoryBufferFormat(gfx::BufferFormat format) { - switch (format) { - case gfx::BufferFormat::ATC: - case gfx::BufferFormat::ATCIA: - case gfx::BufferFormat::DXT1: - case gfx::BufferFormat::DXT5: - case gfx::BufferFormat::ETC1: - case gfx::BufferFormat::R_8: - case gfx::BufferFormat::RGBA_4444: - case gfx::BufferFormat::RGBA_8888: - case gfx::BufferFormat::RGBX_8888: - case gfx::BufferFormat::BGRA_8888: - return 1; - case gfx::BufferFormat::YUV_420: - return 3; - } - NOTREACHED(); - return 0; -} - size_t SubsamplingFactor(gfx::BufferFormat format, int plane) { switch (format) { case gfx::BufferFormat::ATC: @@ -85,7 +66,7 @@ size_t StrideInBytes(size_t width, gfx::BufferFormat format, int plane) { size_t BufferSizeInBytes(const gfx::Size& size, gfx::BufferFormat format) { size_t size_in_bytes = 0; - int num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format); + int num_planes = static_cast<int>(gfx::NumberOfPlanesForBufferFormat(format)); for (int i = 0; i < num_planes; ++i) { size_in_bytes += StrideInBytes(size.width(), format, i) * (size.height() / SubsamplingFactor(format, i)); @@ -110,7 +91,8 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { return false; mapped_ = true; size_t offset = 0; - int num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_); + int num_planes = + static_cast<int>(gfx::NumberOfPlanesForBufferFormat(format_)); for (int i = 0; i < num_planes; ++i) { data[i] = reinterpret_cast<uint8*>(shared_memory_->memory()) + offset; offset += StrideInBytes(size_.width(), format_, i) * @@ -126,7 +108,8 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer { bool IsMapped() const override { return mapped_; } gfx::BufferFormat GetFormat() const override { return format_; } void GetStride(int* stride) const override { - int num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_); + int num_planes = + static_cast<int>(gfx::NumberOfPlanesForBufferFormat(format_)); for (int i = 0; i < num_planes; ++i) stride[i] = base::checked_cast<int>(StrideInBytes(size_.width(), format_, i)); |