Add YUV_420_BIPLANAR to gfx::BufferFormat.

content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc

 // Copyright 2013 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_io_surface.h"
 
 #include "base/logging.h"
 #include "content/common/mac/io_surface_manager.h"
 
 namespace content {
@@ skipping 43 matching lines @@
   return make_scoped_ptr<GpuMemoryBufferImpl>(
       new GpuMemoryBufferImplIOSurface(handle.id, size, format, callback,
                                        io_surface.release(), LockFlags(usage)));
 }
 
 bool GpuMemoryBufferImplIOSurface::Map(void** data) {
   DCHECK(!mapped_);
   IOReturn status = IOSurfaceLock(io_surface_, lock_flags_, NULL);
   DCHECK_NE(status, kIOReturnCannotLock);
   mapped_ = true;
-  *data = IOSurfaceGetBaseAddress(io_surface_);
+
+  const size_t planes = IOSurfaceGetPlaneCount(io_surface_);

[reveman, 2015/08/10 22:40:54]

nit: no need for 'const' and maybe plane_count or num_planes instead of 'planes'

[Andre, 2015/08/11 03:50:46]

Done.

+  if (planes == 0) {

[reveman, 2015/08/10 22:40:54]

Does IOSurfaceGetPlaneCount actually return this? Please DCHECK_GT and remove
the if clause if possible.

[Andre, 2015/08/11 03:50:46]

Yes, IOSurface actually returns 0 in the non-planar case.
But I can replace it with a call to NumberOfPlanesForGpuMemoryBufferFormat() and
remove the if clause.

+    data[0] = IOSurfaceGetBaseAddress(io_surface_);
+  } else {
+    for (size_t plane = 0; plane < planes; ++plane)
+      data[plane] = IOSurfaceGetBaseAddressOfPlane(io_surface_, plane);
+  }
   return true;
 }
 
 void GpuMemoryBufferImplIOSurface::Unmap() {
   DCHECK(mapped_);
   IOSurfaceUnlock(io_surface_, lock_flags_, NULL);
   mapped_ = false;
 }
 
-void GpuMemoryBufferImplIOSurface::GetStride(int* stride) const {
-  *stride = IOSurfaceGetBytesPerRow(io_surface_);
+void GpuMemoryBufferImplIOSurface::GetStride(int* strides) const {

[reveman, 2015/08/10 22:40:55]

same comments here as above

[Andre, 2015/08/11 03:50:45]

Done.

+  const size_t planes = IOSurfaceGetPlaneCount(io_surface_);
+  if (planes == 0) {
+    strides[0] = IOSurfaceGetBytesPerRow(io_surface_);
+  } else {
+    for (size_t plane = 0; plane < planes; ++plane)
+      strides[plane] = IOSurfaceGetBytesPerRowOfPlane(io_surface_, plane);
+  }
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplIOSurface::GetHandle() const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::IO_SURFACE_BUFFER;
   handle.id = id_;
   return handle;
 }
 
 }  // namespace content