Mac video: Enable AVSampleBufferDisplayLayer for h264

ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm

 // Copyright 2016 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 <memory>
 
 #include "base/mac/sdk_forward_declarations.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 37 matching lines @@
 
   // Validate the initial values.
   {
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 38 matching lines @@
   // Update just the clip rect and re-commit.
   {
     clip_rect = gfx::Rect(4, 8, 16, 32);
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 21 matching lines @@
   // Disable clipping and re-commit.
   {
     is_clipped = false;
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 18 matching lines @@
   // Change the transform and re-commit.
   {
     transform.Translate(5, 5);
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 16 matching lines @@
   // Change the edge antialiasing mask and commit.
   {
     edge_aa_mask = GL_CA_LAYER_EDGE_TOP_CHROMIUM;
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 14 matching lines @@
 
   // Change the contents and commit.
   {
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         nullptr,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 16 matching lines @@
   // Change the rect size.
   {
     rect = gfx::Rect(rect.origin(), gfx::Size(32, 16));
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         nullptr,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 16 matching lines @@
   // Change the rect position.
   {
     rect = gfx::Rect(gfx::Point(16, 4), rect.size());
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         nullptr,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 16 matching lines @@
   // Change the opacity.
   {
     opacity = 1.0f;
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         nullptr,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 15 matching lines @@
   // Add the clipping and IOSurface contents back.
   {
     is_clipped = true;
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 16 matching lines @@
   // Change the scale factor. This should result in a new tree being created.
   {
     scale_factor = 2.0f;
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
@@ skipping 75 matching lines @@
 
   // Schedule and commit the layers.
   std::unique_ptr<ui::CALayerTree> ca_layer_tree(new ui::CALayerTree);
   for (size_t i = 0; i < 5; ++i) {
     bool result = ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_id,
         transforms[i],
         io_surfaces[i],
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
   }
   ca_layer_tree->CommitScheduledCALayers(superlayer_, nullptr, scale_factor);
 
   // Validate the root layer.
@@ skipping 65 matching lines @@
 
   // Schedule and commit the layers.
   std::unique_ptr<ui::CALayerTree> ca_layer_tree(new ui::CALayerTree);
   for (size_t i = 0; i < 3; ++i) {
     bool result = ca_layer_tree->ScheduleCALayer(
         is_clipped,
         clip_rect,
         sorting_context_ids[i],
         transform,
         io_surfaces[i],
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
   }
   ca_layer_tree->CommitScheduledCALayers(superlayer_, nullptr, scale_factor);
 
   // Validate the root layer.
@@ skipping 53 matching lines @@
   // First send the various clip parameters to sorting context zero. This is
   // legitimate.
   for (size_t i = 0; i < 3; ++i) {
     int sorting_context_id = 0;
     bool result = ca_layer_tree->ScheduleCALayer(
         is_clippeds[i],
         clip_rects[i],
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
   }
   // Next send the various clip parameters to a non-zero sorting context. This
   // will fail when we try to change the clip within the sorting context.
   for (size_t i = 0; i < 3; ++i) {
     int sorting_context_id = 3;
     bool result = ca_layer_tree->ScheduleCALayer(
         is_clippeds[i],
         clip_rects[i],
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     if (i == 0)
       EXPECT_TRUE(result);
     else
       EXPECT_FALSE(result);
   }
   // Try once more with the original clip and verify it works.
   {
     int sorting_context_id = 3;
     bool result = ca_layer_tree->ScheduleCALayer(
         is_clippeds[0],
         clip_rects[0],
         sorting_context_id,
         transform,
         io_surface,
+        nullptr,
         contents_rect,
         rect,
         background_color,
         edge_aa_mask,
         opacity);
     EXPECT_TRUE(result);
   }
 }
 
 // Test updating each layer's properties.
 TEST_F(CALayerTreeTest, AVLayer) {
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface(gfx::CreateIOSurface(
       gfx::Size(256, 256), gfx::BufferFormat::YUV_420_BIPLANAR));
+
   bool is_clipped = true;
   gfx::Rect clip_rect(2, 4, 8, 16);
   int sorting_context_id = 0;
   gfx::Transform transform;
   gfx::RectF contents_rect(0.0f, 0.0f, 1.0f, 1.0f);
   gfx::Rect rect(16, 32, 64, 128);
   unsigned background_color = SkColorSetARGB(0xFF, 0xFF, 0, 0);
   unsigned edge_aa_mask = GL_CA_LAYER_EDGE_LEFT_CHROMIUM;
   float opacity = 0.5f;
   float scale_factor = 1.0f;
   bool result = false;
 
   std::unique_ptr<ui::CALayerTree> ca_layer_tree;
   CALayer* root_layer = nil;
   CALayer* clip_and_sorting_layer = nil;
   CALayer* transform_layer = nil;
   CALayer* content_layer1 = nil;
   CALayer* content_layer2 = nil;
   CALayer* content_layer3 = nil;
 
   // Validate the initial values.
   {
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
-        is_clipped, clip_rect, sorting_context_id, transform, io_surface,
-        contents_rect, rect, background_color, edge_aa_mask, opacity);
+        is_clipped,
+        clip_rect,
+        sorting_context_id,
+        transform,
+        io_surface,
+        nullptr,
+        contents_rect,
+        rect, background_color,
+        edge_aa_mask,
+        opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
     // Validate the tree structure.
     EXPECT_EQ(1u, [[superlayer_ sublayers] count]);
     root_layer = [[superlayer_ sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[root_layer sublayers] count]);
     clip_and_sorting_layer = [[root_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
     transform_layer = [[clip_and_sorting_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[transform_layer sublayers] count]);
     content_layer1 = [[transform_layer sublayers] objectAtIndex:0];
 
     // Validate the content layer.
     EXPECT_FALSE([content_layer1
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
   }
 
   io_surface.reset(gfx::CreateIOSurface(gfx::Size(256, 256),
                                         gfx::BufferFormat::YUV_420_BIPLANAR));
 
   // Pass another frame.
   {
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
-        is_clipped, clip_rect, sorting_context_id, transform, io_surface,
-        contents_rect, rect, background_color, edge_aa_mask, opacity);
+        is_clipped,
+        clip_rect,
+        sorting_context_id,
+        transform,
+        io_surface,
+        nullptr,
+        contents_rect,
+        rect,
+        background_color,
+        edge_aa_mask,
+        opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
     // Validate the tree structure.
     EXPECT_EQ(1u, [[superlayer_ sublayers] count]);
     root_layer = [[superlayer_ sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[root_layer sublayers] count]);
     clip_and_sorting_layer = [[root_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
     transform_layer = [[clip_and_sorting_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[transform_layer sublayers] count]);
     content_layer2 = [[transform_layer sublayers] objectAtIndex:0];
 
     // Validate the content layer.
     EXPECT_FALSE([content_layer2
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
     EXPECT_EQ(content_layer2, content_layer1);
   }
 
   io_surface.reset(gfx::CreateIOSurface(gfx::Size(256, 256),
                                         gfx::BufferFormat::YUV_420_BIPLANAR));
+  base::ScopedCFTypeRef<CVPixelBufferRef> cv_pixel_buffer;
+  CVPixelBufferCreateWithIOSurface(
+      nullptr, io_surface, nullptr, cv_pixel_buffer.InitializeInto());
+
+  // Pass a frame with a CVPixelBuffer
+  {
+    std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
+    result = new_ca_layer_tree->ScheduleCALayer(
+        is_clipped,
+        clip_rect,
+        sorting_context_id,
+        transform,
+        io_surface,
+        cv_pixel_buffer,
+        contents_rect,
+        rect,
+        background_color,
+        edge_aa_mask,
+        opacity);
+    EXPECT_TRUE(result);
+    new_ca_layer_tree->CommitScheduledCALayers(
+        superlayer_, std::move(ca_layer_tree), scale_factor);
+    std::swap(new_ca_layer_tree, ca_layer_tree);
+
+    // Validate the tree structure.
+    EXPECT_EQ(1u, [[superlayer_ sublayers] count]);
+    root_layer = [[superlayer_ sublayers] objectAtIndex:0];
+    EXPECT_EQ(1u, [[root_layer sublayers] count]);
+    clip_and_sorting_layer = [[root_layer sublayers] objectAtIndex:0];
+    EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
+    transform_layer = [[clip_and_sorting_layer sublayers] objectAtIndex:0];
+    EXPECT_EQ(1u, [[transform_layer sublayers] count]);
+    content_layer2 = [[transform_layer sublayers] objectAtIndex:0];
+
+    // Validate the content layer.
+    EXPECT_TRUE([content_layer2
+        isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
+    EXPECT_NE(content_layer2, content_layer1);
+  }
+
+  io_surface.reset(gfx::CreateIOSurface(gfx::Size(256, 256),
+                                        gfx::BufferFormat::YUV_420_BIPLANAR));
+  cv_pixel_buffer.reset();
 
   // Pass a frame that is clipped.
   contents_rect = gfx::RectF(0, 0, 1, 0.9);
   {
     std::unique_ptr<ui::CALayerTree> new_ca_layer_tree(new ui::CALayerTree);
     result = new_ca_layer_tree->ScheduleCALayer(
-        is_clipped, clip_rect, sorting_context_id, transform, io_surface,
-        contents_rect, rect, background_color, edge_aa_mask, opacity);
+        is_clipped,
+        clip_rect,
+        sorting_context_id,
+        transform,
+        io_surface,
+        nullptr,
+        contents_rect,
+        rect,
+        background_color,
+        edge_aa_mask,
+        opacity);
     EXPECT_TRUE(result);
     new_ca_layer_tree->CommitScheduledCALayers(
         superlayer_, std::move(ca_layer_tree), scale_factor);
     std::swap(new_ca_layer_tree, ca_layer_tree);
 
     // Validate the tree structure.
     EXPECT_EQ(1u, [[superlayer_ sublayers] count]);
     root_layer = [[superlayer_ sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[root_layer sublayers] count]);
     clip_and_sorting_layer = [[root_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[clip_and_sorting_layer sublayers] count]);
     transform_layer = [[clip_and_sorting_layer sublayers] objectAtIndex:0];
     EXPECT_EQ(1u, [[transform_layer sublayers] count]);
     content_layer3 = [[transform_layer sublayers] objectAtIndex:0];
 
     // Validate the content layer.
     EXPECT_FALSE([content_layer3
         isKindOfClass:NSClassFromString(@"AVSampleBufferDisplayLayer")]);
-    EXPECT_EQ(content_layer3, content_layer2);
+    EXPECT_NE(content_layer3, content_layer2);
   }
 }
 
 }  // namespace gpu