HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl

media/base/video_frame.cc

Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 7e654319c52c9964250023eb8ea2ea83bff85802..55b4cb68aba711a4e13b05400614e783e7536994 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -409,6 +409,7 @@ VideoFrame::VideoFrame(VideoFrame::Format format,
       natural_size_(natural_size),
       shared_memory_handle_(base::SharedMemory::NULLHandle()),
       timestamp_(timestamp),
+      release_sync_point_(0),
       end_of_stream_(end_of_stream) {
   memset(&strides_, 0, sizeof(strides_));
   memset(&data_, 0, sizeof(data_));
@@ -416,6 +417,11 @@ VideoFrame::VideoFrame(VideoFrame::Format format,
 
 VideoFrame::~VideoFrame() {
   if (!mailbox_holder_release_cb_.is_null()) {
+    {
+      base::AutoLock locker(release_sync_point_lock_);
+      if (release_sync_point_)
+        mailbox_holder_->sync_point = release_sync_point_;
+    }
     base::ResetAndReturn(&mailbox_holder_release_cb_)
         .Run(mailbox_holder_.Pass());
   }
@@ -498,6 +504,14 @@ base::SharedMemoryHandle VideoFrame::shared_memory_handle() const {
   return shared_memory_handle_;
 }
 
+uint32 VideoFrame::SwapReleaseSyncPoint(uint32 sync_point) {
+  DCHECK_EQ(format_, NATIVE_TEXTURE);
+  base::AutoLock locker(release_sync_point_lock_);
+  uint32 previous_sync_point = release_sync_point_;
+  release_sync_point_ = sync_point;
+  return previous_sync_point;
+}
+
 void VideoFrame::HashFrameForTesting(base::MD5Context* context) {
   for (int plane = 0; plane < kMaxPlanes; ++plane) {
     if (!IsValidPlane(plane))