cc: Don't do produce/consume on the texture id given in VideoFrame.

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 "base/bind.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/resources/resource_provider.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "media/base/video_frame.h"
 #include "media/filters/skcanvas_video_renderer.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/size_conversions.h"
 
 const unsigned kYUVResourceFormat = GL_LUMINANCE;
 const unsigned kRGBResourceFormat = GL_RGBA;
 
 namespace cc {
 
-VideoFrameExternalResources::VideoFrameExternalResources() : type(NONE) {}
+VideoFrameExternalResources::VideoFrameExternalResources()
+    : type(NONE), hardware_resource(0) {}
 
 VideoFrameExternalResources::~VideoFrameExternalResources() {}
 
 VideoResourceUpdater::VideoResourceUpdater(ResourceProvider* resource_provider)
     : resource_provider_(resource_provider) {
 }
 
 VideoResourceUpdater::~VideoResourceUpdater() {
   while (!recycled_resources_.empty()) {
     resource_provider_->DeleteResource(recycled_resources_.back().resource_id);
@@ skipping 249 matching lines @@
         TextureMailbox(mailbox,
                        callback_to_free_resource,
                        plane_resources[i].sync_point));
   }
 
   external_resources.type = VideoFrameExternalResources::YUV_RESOURCE;
   return external_resources;
 }
 
 VideoFrameExternalResources VideoResourceUpdater::CreateForHardwarePlanes(
-    const scoped_refptr<media::VideoFrame>& video_frame,
-    const TextureMailbox::ReleaseCallback& release_callback) {
+    const scoped_refptr<media::VideoFrame>& video_frame) {
   if (!VerifyFrame(video_frame))
     return VideoFrameExternalResources();
 
   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();
 
   WebKit::WebGraphicsContext3D* context =
@@ skipping 11 matching lines @@
           VideoFrameExternalResources::STREAM_TEXTURE_RESOURCE;
       break;
     case GL_TEXTURE_RECTANGLE_ARB:
       external_resources.type = VideoFrameExternalResources::IO_SURFACE;
       break;
     default:
       NOTREACHED();
       return VideoFrameExternalResources();
   }
 
-  gpu::Mailbox mailbox;
-  GLC(context, context->genMailboxCHROMIUM(mailbox.name));
-  GLC(context, context->bindTexture(GL_TEXTURE_2D, video_frame->texture_id()));
-  GLC(context, context->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name));
-  GLC(context, context->bindTexture(GL_TEXTURE_2D, 0));
+  external_resources.hardware_resource =
+      resource_provider_->CreateResourceFromExternalTexture(
+          video_frame->texture_id());
 
   TextureMailbox::ReleaseCallback callback_to_return_resource =
       base::Bind(&ReturnTexture,
                  base::Unretained(resource_provider_),
-                 release_callback,
-                 video_frame->texture_id(),
-                 mailbox);
-  external_resources.mailboxes.push_back(
-      TextureMailbox(mailbox, callback_to_return_resource));
+                 external_resources.hardware_resource);
+  external_resources.hardware_release_callback = callback_to_return_resource;
   return external_resources;
 }
 
 // static
 void VideoResourceUpdater::ReturnTexture(
     ResourceProvider* resource_provider,
-    TextureMailbox::ReleaseCallback callback,
-    unsigned texture_id,
-    gpu::Mailbox mailbox,
+    unsigned resource_id,
     unsigned sync_point,
     bool lost_resource) {
-  WebKit::WebGraphicsContext3D* context =
-      resource_provider->GraphicsContext3D();
-  GLC(context, context->bindTexture(GL_TEXTURE_2D, texture_id));

[no sievers, 2013/04/13 01:14:30]

Hey when you reland, be sure to use the right texture target in all
glBindTexture(), glProduceTexture(), glConsumeTexture() calls. That is,
GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_RECTANGLE_ARB where necessary :)

[danakj, 2013/04/13 16:47:25]

Ohh right. Thanks, I shall pay attention to that 

-  GLC(context, context->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name));
-  GLC(context, context->bindTexture(GL_TEXTURE_2D, 0));
-  callback.Run(sync_point, lost_resource);
+  resource_provider->DeleteResource(resource_id);
 }
 
 // static
 void VideoResourceUpdater::RecycleResource(
     base::WeakPtr<VideoResourceUpdater> updater,
     ResourceProvider* resource_provider,
     RecycleResourceData data,
     unsigned sync_point,
     bool lost_resource) {
   WebKit::WebGraphicsContext3D* context =
@@ skipping 24 matching lines @@
   }
 
   PlaneResource recycled_resource(data.resource_id,
                                   data.resource_size,
                                   data.resource_format,
                                   sync_point);
   updater->recycled_resources_.push_back(recycled_resource);
 }
 
 }  // namespace cc