summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorandresantoso <andresantoso@chromium.org>2015-08-11 17:04:22 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-12 00:04:51 +0000
commit85f29861d095a7c5dcf318053e8349d1efaddbab (patch)
tree0695b39474d7efbdb7ea4010d657f48ef7446b24 /gpu
parent68a02a6c17c253a138ecc88e4085a2b9bf08b709 (diff)
downloadchromium_src-85f29861d095a7c5dcf318053e8349d1efaddbab.zip
chromium_src-85f29861d095a7c5dcf318053e8349d1efaddbab.tar.gz
chromium_src-85f29861d095a7c5dcf318053e8349d1efaddbab.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 Review URL: https://codereview.chromium.org/1281043006 Cr-Commit-Position: refs/heads/master@{#342942}
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/tests/gl_manager.cc27
1 files changed, 4 insertions, 23 deletions
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index 3b9e170..5489358 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -30,6 +30,7 @@
#include "gpu/command_buffer/service/memory_tracking.h"
#include "gpu/command_buffer/service/valuebuffer_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/buffer_format_util.h"
#include "ui/gfx/gpu_memory_buffer.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_image_ref_counted_memory.h"
@@ -39,26 +40,6 @@
namespace gpu {
namespace {
-size_t 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:
@@ -116,7 +97,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;
- size_t num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format);
+ size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format);
for (size_t i = 0; i < num_planes; ++i) {
size_in_bytes += StrideInBytes(size.width(), format, i) *
(size.height() / SubsamplingFactor(format, i));
@@ -138,7 +119,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
// Overridden from gfx::GpuMemoryBuffer:
bool Map(void** data) override {
size_t offset = 0;
- size_t num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_);
+ size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format_);
for (size_t i = 0; i < num_planes; ++i) {
data[i] = reinterpret_cast<uint8*>(&bytes_->data().front()) + offset;
offset += StrideInBytes(size_.width(), format_, i) *
@@ -151,7 +132,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
bool IsMapped() const override { return mapped_; }
gfx::BufferFormat GetFormat() const override { return format_; }
void GetStride(int* stride) const override {
- size_t num_planes = NumberOfPlanesForGpuMemoryBufferFormat(format_);
+ size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format_);
for (size_t i = 0; i < num_planes; ++i)
stride[i] = StrideInBytes(size_.width(), format_, i);
}