Send hardware video frames with mailboxes.

media/base/video_frame.cc

 // Copyright (c) 2012 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 "media/base/video_frame.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 45 matching lines @@
           visible_rect.right() <= coded_size.width() &&
           visible_rect.bottom() <= coded_size.height() &&
           !natural_size.IsEmpty() &&
           natural_size.GetArea() <= limits::kMaxCanvas &&
           natural_size.width() <= limits::kMaxDimension &&
           natural_size.height() <= limits::kMaxDimension);
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
-    uint32 texture_id,
+    const gpu::Mailbox& texture_mailbox,
+    uint32 sync_point,
     uint32 texture_target,
     const gfx::Size& coded_size,
     const gfx::Rect& visible_rect,
     const gfx::Size& natural_size,
     base::TimeDelta timestamp,
     const ReadPixelsCB& read_pixels_cb,
+    const TextureNoLongerNeededCallback& texture_no_longer_needed_cb,
     const base::Closure& no_longer_needed_cb) {
   scoped_refptr<VideoFrame> frame(new VideoFrame(
       NATIVE_TEXTURE, coded_size, visible_rect, natural_size, timestamp));
-  frame->texture_id_ = texture_id;
+  frame->texture_mailbox_ = texture_mailbox;
+  frame->texture_mailbox_sync_point_ = sync_point;
   frame->texture_target_ = texture_target;
   frame->read_pixels_cb_ = read_pixels_cb;
   frame->no_longer_needed_cb_ = no_longer_needed_cb;
+  frame->texture_no_longer_needed_cb_ = texture_no_longer_needed_cb;
   return frame;
 }
 
 void VideoFrame::ReadPixelsFromNativeTexture(const SkBitmap& pixels) {
   DCHECK_EQ(format_, NATIVE_TEXTURE);
   if (!read_pixels_cb_.is_null())
     read_pixels_cb_.Run(pixels);
 }
 
 // static
@@ skipping 156 matching lines @@
 
 VideoFrame::VideoFrame(VideoFrame::Format format,
                        const gfx::Size& coded_size,
                        const gfx::Rect& visible_rect,
                        const gfx::Size& natural_size,
                        base::TimeDelta timestamp)
     : format_(format),
       coded_size_(coded_size),
       visible_rect_(visible_rect),
       natural_size_(natural_size),
-      texture_id_(0),
       texture_target_(0),
       timestamp_(timestamp) {

[scherkus (not reviewing), 2013/04/19 23:32:07]

init texture_mailbox_sync_point_ to some sort of known value for
non-native_texture paths?

[danakj, 2013/04/19 23:52:07]

Done.

   memset(&strides_, 0, sizeof(strides_));
   memset(&data_, 0, sizeof(data_));
 }
 
 VideoFrame::~VideoFrame() {
+  if (!texture_no_longer_needed_cb_.is_null()) {
+    base::ResetAndReturn(&texture_no_longer_needed_cb_).Run(
+        texture_mailbox_sync_point_);
+  }
   if (!no_longer_needed_cb_.is_null())
     base::ResetAndReturn(&no_longer_needed_cb_).Run();
 }
 
 bool VideoFrame::IsValidPlane(size_t plane) const {
   return (plane < NumPlanes(format_));
 }
 
 int VideoFrame::stride(size_t plane) const {
   DCHECK(IsValidPlane(plane));
@@ skipping 44 matching lines @@
   // Intentionally leave out non-production formats.
   NOTREACHED() << "Unsupported video frame format: " << format_;
   return 0;
 }
 
 uint8* VideoFrame::data(size_t plane) const {
   DCHECK(IsValidPlane(plane));
   return data_[plane];
 }
 
-uint32 VideoFrame::texture_id() const {
+const gpu::Mailbox& VideoFrame::texture_mailbox() const {
   DCHECK_EQ(format_, NATIVE_TEXTURE);
-  return texture_id_;
+  return texture_mailbox_;
+}
+
+uint32 VideoFrame::texture_mailbox_sync_point() const {
+  DCHECK_EQ(format_, NATIVE_TEXTURE);
+  return texture_mailbox_sync_point_;
+}
+
+void VideoFrame::set_texture_mailbox_sync_point(uint32 sync_point) {
+  DCHECK_EQ(format_, NATIVE_TEXTURE);
+  texture_mailbox_sync_point_ = sync_point;
 }
 
 uint32 VideoFrame::texture_target() const {
   DCHECK_EQ(format_, NATIVE_TEXTURE);
   return texture_target_;
 }
 
 bool VideoFrame::IsEndOfStream() const {
   return format_ == VideoFrame::EMPTY;
 }
 
 void VideoFrame::HashFrameForTesting(base::MD5Context* context) {
   for (int plane = 0; plane < kMaxPlanes; ++plane) {
     if (!IsValidPlane(plane))
       break;
     for (int row = 0; row < rows(plane); ++row) {
       base::MD5Update(context, base::StringPiece(
           reinterpret_cast<char*>(data(plane) + stride(plane) * row),
           row_bytes(plane)));
     }
   }
 }
 
 }  // namespace media