Add multi-planar functions to GpuMemoryBuffer

content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 
 #include "base/bind.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 69 matching lines @@
   const int kBufferId = 1;
 
   gfx::Size buffer_size(1, 1);
 
   for (auto configuration : supported_configurations_) {
     if (configuration.usage != gfx::GpuMemoryBuffer::MAP)
       continue;
 
     size_t width_in_bytes = 0;
     EXPECT_TRUE(GpuMemoryBufferImpl::StrideInBytes(
         buffer_size.width(), configuration.format, &width_in_bytes));

[reveman, 2015/03/24 22:16:53]

GpuMemoryBufferImpl::StrideInBytes doesn't support multi plane formats. You can
leave that for a follow up patch if you like as it's specific to the
implementation and not in the gfx::GpuMemoryBuffer API. However, in that case,
this test will have to assume one plane below instead of the multi plane code
you changed it to.

[emircan, 2015/03/24 22:45:16]

We can leave it to the follow up patch when new formats are defined. I changed
the following methods to follow that.

     EXPECT_GT(width_in_bytes, 0u);
     scoped_ptr<char[]> data(new char[width_in_bytes]);
     memset(data.get(), 0x2a, width_in_bytes);
 
     scoped_ptr<GpuMemoryBufferImpl> buffer(
         GpuMemoryBufferImpl::CreateFromHandle(
             CreateGpuMemoryBuffer(kBufferId,
                                   buffer_size,
                                   configuration.format,
                                   configuration.usage),
             buffer_size,
             configuration.format,
             base::Bind(&GpuMemoryBufferImplTest::DestroyGpuMemoryBuffer,
                        base::Unretained(this),
                        kBufferId)));
     ASSERT_TRUE(buffer);
     EXPECT_FALSE(buffer->IsMapped());
 
-    void* memory = buffer->Map();
-    ASSERT_TRUE(memory);
+    size_t num_buffers = buffer->GetNumberOfPlanes();
+
+    // Map buffer into user space.
+    void* mapped_buffers[num_buffers];
+    bool map_completed = buffer->Map(mapped_buffers);
+    ASSERT_TRUE(map_completed);
     EXPECT_TRUE(buffer->IsMapped());
-    uint32 stride = buffer->GetStride();
-    EXPECT_GE(stride, width_in_bytes);
-    memcpy(memory, data.get(), width_in_bytes);
-    EXPECT_EQ(memcmp(memory, data.get(), width_in_bytes), 0);
+
+    // Get strides.
+    uint32 strides[num_buffers];
+    bool getStride_completed = buffer->GetStride(strides);
+    DCHECK(getStride_completed);
+
+    // Copy and compare mapped buffers.
+    for (size_t i = 0; i < num_buffers; ++i) {
+      EXPECT_GE(strides[i], width_in_bytes);
+      memcpy(mapped_buffers[i], data.get(), width_in_bytes);
+      EXPECT_EQ(memcmp(mapped_buffers[i], data.get(), width_in_bytes), 0);
+    }
+
     buffer->Unmap();
     EXPECT_FALSE(buffer->IsMapped());
   }
 }
 
 std::vector<gfx::GpuMemoryBufferType> GetSupportedGpuMemoryBufferTypes() {
   std::vector<gfx::GpuMemoryBufferType> supported_types;
   GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);
   return supported_types;
 }
 
 INSTANTIATE_TEST_CASE_P(
     GpuMemoryBufferImplTests,
     GpuMemoryBufferImplTest,
     ::testing::ValuesIn(GetSupportedGpuMemoryBufferTypes()));
 
 }  // namespace
 }  // namespace content