Add YUV_420_BIPLANAR to gfx::BufferFormat.

content/common/gpu/gpu_memory_buffer_factory_io_surface.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/gpu_memory_buffer_factory_io_surface.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include <vector>
 
 #include "base/logging.h"
 #include "content/common/mac/io_surface_manager.h"
 #include "ui/gl/gl_image_io_surface.h"
 
 namespace content {
 namespace {
 
 void AddIntegerValue(CFMutableDictionaryRef dictionary,
                      const CFStringRef key,
                      int32 value) {
   base::ScopedCFTypeRef<CFNumberRef> number(
       CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
   CFDictionaryAddValue(dictionary, key, number.get());
 }
 
 int32 BytesPerPixel(gfx::BufferFormat format) {
   switch (format) {
     case gfx::BufferFormat::R_8:
+    case gfx::BufferFormat::YUV_420_BIPLANAR:
       return 1;
     case gfx::BufferFormat::BGRA_8888:
       return 4;
     case gfx::BufferFormat::ATC:
     case gfx::BufferFormat::ATCIA:
     case gfx::BufferFormat::DXT1:
     case gfx::BufferFormat::DXT5:
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
     case gfx::BufferFormat::RGBX_8888:
     case gfx::BufferFormat::YUV_420:
       NOTREACHED();
       return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
 int32 PixelFormat(gfx::BufferFormat format) {
   switch (format) {
     case gfx::BufferFormat::R_8:
       return 'L008';
     case gfx::BufferFormat::BGRA_8888:
       return 'BGRA';
+    case gfx::BufferFormat::YUV_420_BIPLANAR:
+      return '420v';
     case gfx::BufferFormat::ATC:
     case gfx::BufferFormat::ATCIA:
     case gfx::BufferFormat::DXT1:
     case gfx::BufferFormat::DXT5:
     case gfx::BufferFormat::ETC1:
     case gfx::BufferFormat::RGBA_4444:
     case gfx::BufferFormat::RGBA_8888:
     case gfx::BufferFormat::RGBX_8888:
     case gfx::BufferFormat::YUV_420:
       NOTREACHED();
@@ skipping 47 matching lines @@
     int client_id,
     gfx::PluginWindowHandle surface_handle) {
   base::ScopedCFTypeRef<CFMutableDictionaryRef> properties;
   properties.reset(CFDictionaryCreateMutable(kCFAllocatorDefault,
                                              0,
                                              &kCFTypeDictionaryKeyCallBacks,
                                              &kCFTypeDictionaryValueCallBacks));
   AddIntegerValue(properties, kIOSurfaceWidth, size.width());
   AddIntegerValue(properties, kIOSurfaceHeight, size.height());
   AddIntegerValue(properties, kIOSurfaceBytesPerElement, BytesPerPixel(format));
   AddIntegerValue(properties, kIOSurfacePixelFormat, PixelFormat(format));

[ccameron, 2015/08/10 19:35:08]

I think that, for biplanar, this part needs a dictionary of plane info ...
something like

    NSArray* planes =
        [NSArray arrayWithObjects:
            [NSDictionary dictionaryWithObjectsAndKeys:
                [NSNumber numberWithInt:width],(NSString *)kIOSurfacePlaneWidth,
                [NSNumber numberWithInt:height],(NSString
*)kIOSurfacePlaneHeight,
                [NSNumber numberWithInt:1],(NSString
*)kIOSurfacePlaneBytesPerElement,
                nil],
            [NSDictionary dictionaryWithObjectsAndKeys:
                [NSNumber numberWithInt:width/2],(NSString
*)kIOSurfacePlaneWidth,
                [NSNumber numberWithInt:height/2],(NSString
*)kIOSurfacePlaneHeight,
                [NSNumber numberWithInt:2],(NSString
*)kIOSurfacePlaneBytesPerElement,
                nil],
            nil];
    NSDictionary *options = @{
        (id)kIOSurfaceWidth: @(width),
        (id)kIOSurfaceHeight: @(height),
        (id)kIOSurfacePixelFormat: @(pixelFormat),
        (id)kIOSurfacePlaneInfo: planes,
    };

[Andre, 2015/08/10 20:15:25]

Yep, I'm working on that on a follow-up patch, which will also add
YUV_420_BIPLANAR to kSupportedConfigurations.

[reveman, 2015/08/10 20:28:16]

It's fine to save that for a follow up patch but I think it's confusing to
implement PixelFormat, etc. until the format is properly supported.

[Andre, 2015/08/10 21:09:48]

The follow up patch is https://codereview.chromium.org/1282933002/.
I think I will just combine that patch into this one, see patchset 3.

 
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface(IOSurfaceCreate(properties));
   if (!io_surface)
     return gfx::GpuMemoryBufferHandle();
 
   if (!IOSurfaceManager::GetInstance()->RegisterIOSurface(id, client_id,
                                                           io_surface)) {
     return gfx::GpuMemoryBufferHandle();
   }
 
@@ skipping 46 matching lines @@
 
   scoped_refptr<gfx::GLImageIOSurface> image(
       new gfx::GLImageIOSurface(size, internalformat));
   if (!image->Initialize(it->second.get(), format))
     return scoped_refptr<gfx::GLImage>();
 
   return image;
 }
 
 }  // namespace content