Send hardware video frames with mailboxes.

webkit/renderer/media/webmediaplayer_impl.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 "webkit/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 572 matching lines @@
     unsigned int level,
     unsigned int internal_format,
     unsigned int type,
     bool premultiply_alpha,
     bool flip_y) {
   scoped_refptr<media::VideoFrame> video_frame;
   {
     base::AutoLock auto_lock(lock_);
     video_frame = current_frame_;
   }
-  if (video_frame.get() &&
-      video_frame->format() == media::VideoFrame::NATIVE_TEXTURE &&
-      video_frame->texture_target() == GL_TEXTURE_2D) {
-    uint32 source_texture = video_frame->texture_id();
-    // The video is stored in a unmultiplied format, so premultiply
-    // if necessary.
-    web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
-        premultiply_alpha);
-    // Application itself needs to take care of setting the right flip_y
-    // value down to get the expected result.
-    // flip_y==true means to reverse the video orientation while
-    // flip_y==false means to keep the intrinsic orientation.
-    web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, flip_y);
-    web_graphics_context->copyTextureCHROMIUM(GL_TEXTURE_2D,
-        source_texture, texture, level, internal_format, type);
-    web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, false);
-    web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
-        false);
-    // The flush() operation is not necessary here. It is kept since the
-    // performance will be better when it is added than not.
-    web_graphics_context->flush();
-    return true;
-  }
-  return false;
+
+  if (!video_frame.get())
+    return false;
+  if (video_frame->format() != media::VideoFrame::NATIVE_TEXTURE)
+    return false;
+  if (video_frame->texture_target() != GL_TEXTURE_2D)
+    return false;
+
+  scoped_refptr<media::VideoFrame::MailboxHolder> mailbox_holder =
+      video_frame->texture_mailbox();
+
+  uint32 source_texture = web_graphics_context->createTexture();
+
+  web_graphics_context->waitSyncPoint(mailbox_holder->sync_point());
+  web_graphics_context->bindTexture(GL_TEXTURE_2D, source_texture);
+  web_graphics_context->consumeTextureCHROMIUM(GL_TEXTURE_2D,
+                                               mailbox_holder->mailbox().name);
+
+  // The video is stored in a unmultiplied format, so premultiply
+  // if necessary.
+  web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
+                                    premultiply_alpha);
+  // Application itself needs to take care of setting the right flip_y
+  // value down to get the expected result.
+  // flip_y==true means to reverse the video orientation while
+  // flip_y==false means to keep the intrinsic orientation.
+  web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, flip_y);
+  web_graphics_context->copyTextureCHROMIUM(GL_TEXTURE_2D,
+                                            source_texture,
+                                            texture,
+                                            level,
+                                            internal_format,
+                                            type);
+  web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, false);
+  web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
+                                    false);
+
+  web_graphics_context->bindTexture(GL_TEXTURE_2D, source_texture);
+  web_graphics_context->produceTextureCHROMIUM(GL_TEXTURE_2D,
+                                               mailbox_holder->mailbox().name);

[piman, 2013/06/14 21:47:29]

no need for this produce (which ends up being a noop anyway).

[danakj, 2013/06/14 21:54:39]

Done, leftovers from before.

+  web_graphics_context->deleteTexture(source_texture);
+
+  // The flush() operation is not necessary here. It is kept since the
+  // performance will be better when it is added than not.
+  web_graphics_context->flush();
+  return true;
 }
 
 // Helper functions to report media EME related stats to UMA. They follow the
 // convention of more commonly used macros UMA_HISTOGRAM_ENUMERATION and
 // UMA_HISTOGRAM_COUNTS. The reason that we cannot use those macros directly is
 // that UMA_* macros require the names to be constant throughout the process'
 // lifetime.
 static void EmeUMAHistogramEnumeration(const std::string& key_system,
                                        const std::string& method,
                                        int sample,
@@ skipping 585 matching lines @@
 
   if (pending_repaint_)
     return;
 
   pending_repaint_ = true;
   main_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
 }
 
 }  // namespace webkit_media