cc: VideoResourceUpdater support for YUV native textures.

cc/resources/video_resource_updater.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 "cc/resources/video_resource_updater.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 384 matching lines @@
                              sync_point);
   video_frame->UpdateReleaseSyncPoint(&client);
 }
 
 VideoFrameExternalResources VideoResourceUpdater::CreateForHardwarePlanes(
     const scoped_refptr<media::VideoFrame>& video_frame) {
   TRACE_EVENT0("cc", "VideoResourceUpdater::CreateForHardwarePlanes");
   media::VideoFrame::Format frame_format = video_frame->format();
 
   DCHECK_EQ(frame_format, media::VideoFrame::NATIVE_TEXTURE);
-  if (frame_format != media::VideoFrame::NATIVE_TEXTURE)
-      return VideoFrameExternalResources();
-
   if (!context_provider_)
     return VideoFrameExternalResources();
 
-  DCHECK_EQ(1u, media::VideoFrame::NumTextures(video_frame->texture_format()));
-  const gpu::MailboxHolder& mailbox_holder = video_frame->mailbox_holder(0);
+  size_t textures =
+      media::VideoFrame::NumTextures(video_frame->texture_format());
+  DCHECK_GE(textures, 1u);
   VideoFrameExternalResources external_resources;
-  switch (mailbox_holder.texture_target) {
-    case GL_TEXTURE_2D:
-      external_resources.type = VideoFrameExternalResources::RGB_RESOURCE;
+  switch (video_frame->texture_format()) {
+    case media::VideoFrame::TEXTURE_RGBA:
+      DCHECK_EQ(1u, textures);
+      switch (video_frame->mailbox_holder(0).texture_target) {
+        case GL_TEXTURE_2D:
+          external_resources.type = VideoFrameExternalResources::RGB_RESOURCE;
+          break;
+        case GL_TEXTURE_EXTERNAL_OES:
+          external_resources.type =
+              VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE;
+          break;
+        case GL_TEXTURE_RECTANGLE_ARB:
+          external_resources.type = VideoFrameExternalResources::IO_SURFACE;
+          break;
+        default:
+          NOTREACHED();
+          return VideoFrameExternalResources();
+      }
       break;
-    case GL_TEXTURE_EXTERNAL_OES:
-      external_resources.type =
-          VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE;
+    case media::VideoFrame::TEXTURE_YUV_420:
+      external_resources.type = VideoFrameExternalResources::YUV_RESOURCE;
       break;
-    case GL_TEXTURE_RECTANGLE_ARB:
-      external_resources.type = VideoFrameExternalResources::IO_SURFACE;
-      break;
-    default:
-      NOTREACHED();
-      return VideoFrameExternalResources();
   }

[hendrikw, 2015/05/11 18:53:39]

You should probably have a default and NOTREACHED() here as well.

[Daniele Castagna, 2015/05/11 19:09:12]

We opted to add a DCHECK to verify that extenral_resources is initialized after
the switch instead of adding a default.
In this way as soon as we add a new TextureFormat it'll be clear it has to be
added here.

 
-  external_resources.mailboxes.push_back(
-      TextureMailbox(mailbox_holder.mailbox, mailbox_holder.texture_target,
-                     mailbox_holder.sync_point));
-  external_resources.mailboxes.back().set_allow_overlay(
-      video_frame->allow_overlay());
-  external_resources.release_callbacks.push_back(
-      base::Bind(&ReturnTexture, AsWeakPtr(), video_frame));
+  for (size_t i = 0; i < textures; ++i) {
+    const gpu::MailboxHolder& mailbox_holder = video_frame->mailbox_holder(i);
+    external_resources.mailboxes.push_back(
+        TextureMailbox(mailbox_holder.mailbox, mailbox_holder.texture_target,
+                       mailbox_holder.sync_point));
+    external_resources.mailboxes.back().set_allow_overlay(
+        video_frame->allow_overlay());
+    external_resources.release_callbacks.push_back(
+        base::Bind(&ReturnTexture, AsWeakPtr(), video_frame));
+  }
   return external_resources;
 }
 
 // static
 void VideoResourceUpdater::RecycleResource(
     base::WeakPtr<VideoResourceUpdater> updater,
     ResourceProvider::ResourceId resource_id,
     uint32 sync_point,
     bool lost_resource,
     BlockingTaskRunner* main_thread_task_runner) {
@@ skipping 19 matching lines @@
     resource_it->ref_count = 0;
     updater->DeleteResource(resource_it);
     return;
   }
 
   --resource_it->ref_count;
   DCHECK_GE(resource_it->ref_count, 0);
 }
 
 }  // namespace cc