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

content/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 "content/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 517 matching lines @@
     // are exceptions such as webgl where compositing is used in the WebView but
     // video frames are still rendered to a canvas.
     UMA_HISTOGRAM_BOOLEAN(
         "Media.AcceleratedCompositingActive",
         frame_->view()->isAcceleratedCompositingActive());
   }
 
 
   TRACE_EVENT0("media", "WebMediaPlayerImpl:paint");
   scoped_refptr<media::VideoFrame> video_frame = painter_.GetCurrentFrame(true);
+  if (video_frame &&
+      video_frame->format() == media::VideoFrame::NATIVE_TEXTURE) {
+    DCHECK(gpu_factories_);
+    gpu_factories_->WaitSyncPoint(video_frame->mailbox_holder()->sync_point);
+  }
   gfx::Rect gfx_rect(rect);
   skcanvas_video_renderer_.Paint(video_frame.get(), canvas, gfx_rect, alpha);
+  if (video_frame &&
+      video_frame->format() == media::VideoFrame::NATIVE_TEXTURE) {
+    DCHECK(gpu_factories_);
+    uint32 previous_sync_point =
+        video_frame->SwapReleaseSyncPoint(gpu_factories_->InsertSyncPoint());
+    if (previous_sync_point)
+      gpu_factories_->WaitSyncPoint(previous_sync_point);
+  }
 }
 
 bool WebMediaPlayerImpl::hasSingleSecurityOrigin() const {
   if (data_source_)
     return data_source_->HasSingleOrigin();
   return true;
 }
 
 bool WebMediaPlayerImpl::didPassCORSAccessCheck() const {
   if (data_source_)
@@ skipping 126 matching lines @@
                                     false);
 
   // Restore the state for TEXTURE_2D binding point as mentioned above.
   web_graphics_context->bindTexture(GL_TEXTURE_2D, texture);
 
   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();
+  uint32 previous_sync_point = video_frame->SwapReleaseSyncPoint(
+      web_graphics_context->insertSyncPoint());
+  if (previous_sync_point)
+    web_graphics_context->waitSyncPoint(previous_sync_point);
   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,
@@ skipping 620 matching lines @@
 
   if (web_cdm_) {
     decryptor_ready_cb.Run(web_cdm_->GetDecryptor());
     return;
   }
 
   decryptor_ready_cb_ = decryptor_ready_cb;
 }
 
 }  // namespace content