Bug Fix: Rendering stuck due to thread issue of WebMediaPlayerMSCompositor (M51)

content/renderer/media/webmediaplayer_ms_compositor.cc

 // Copyright 2015 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_ms_compositor.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/hash.h"
@@ skipping 272 matching lines @@
 }
 
 bool WebMediaPlayerMSCompositor::HasCurrentFrame() {
   base::AutoLock auto_lock(current_frame_lock_);
   return current_frame_.get() != nullptr;
 }
 
 scoped_refptr<media::VideoFrame> WebMediaPlayerMSCompositor::GetCurrentFrame() {
   DVLOG(3) << __FUNCTION__;
   base::AutoLock auto_lock(current_frame_lock_);
+  current_frame_used_by_compositor_ = true;
+  return current_frame_;
+}
+
+void WebMediaPlayerMSCompositor::PutCurrentFrame() {
+  DVLOG(3) << __FUNCTION__;
+}
+
+scoped_refptr<media::VideoFrame>
+WebMediaPlayerMSCompositor::GetCurrentFrameWithoutUpdatingStatistics() {
+  DVLOG(3) << __FUNCTION__;
+  base::AutoLock auto_lock(current_frame_lock_);
   return current_frame_;
 }
 
-void WebMediaPlayerMSCompositor::PutCurrentFrame() {
-  DVLOG(3) << __FUNCTION__;
-  base::AutoLock auto_lock(current_frame_lock_);
-  current_frame_used_by_compositor_ = true;
-}
-
 void WebMediaPlayerMSCompositor::StartRendering() {
   DCHECK(thread_checker_.CalledOnValidThread());
   compositor_task_runner_->PostTask(
       FROM_HERE, base::Bind(&WebMediaPlayerMSCompositor::StartRenderingInternal,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebMediaPlayerMSCompositor::StartRenderingInternal() {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
   stopped_ = false;
@@ skipping 111 matching lines @@
   }
 
   if (!rendering_frame_buffer_) {
     rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
         base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
                    base::Unretained(this))));
   }
 }
 
 }  // namespace content