| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/video_frame_compositor.h" | 5 #include "content/renderer/media/video_frame_compositor.h" |
| 6 | 6 |
| 7 #include "media/base/video_frame.h" | 7 #include "media/base/video_frame.h" |
| 8 | 8 |
| 9 namespace content { | 9 namespace content { |
| 10 | 10 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 scoped_refptr<media::VideoFrame> VideoFrameCompositor::GetCurrentFrame() { | 52 scoped_refptr<media::VideoFrame> VideoFrameCompositor::GetCurrentFrame() { |
| 53 return current_frame_; | 53 return current_frame_; |
| 54 } | 54 } |
| 55 | 55 |
| 56 void VideoFrameCompositor::PutCurrentFrame( | 56 void VideoFrameCompositor::PutCurrentFrame( |
| 57 const scoped_refptr<media::VideoFrame>& frame) { | 57 const scoped_refptr<media::VideoFrame>& frame) { |
| 58 } | 58 } |
| 59 | 59 |
| 60 void VideoFrameCompositor::UpdateCurrentFrame( | 60 void VideoFrameCompositor::UpdateCurrentFrame( |
| 61 const scoped_refptr<media::VideoFrame>& frame) { | 61 const scoped_refptr<media::VideoFrame>& frame) { |
| 62 if (current_frame_ && | 62 if (current_frame_.get() && |
| 63 current_frame_->natural_size() != frame->natural_size()) { | 63 current_frame_->natural_size() != frame->natural_size()) { |
| 64 natural_size_changed_cb_.Run(frame->natural_size()); | 64 natural_size_changed_cb_.Run(frame->natural_size()); |
| 65 } | 65 } |
| 66 | 66 |
| 67 if (!current_frame_ || IsOpaque(current_frame_) != IsOpaque(frame)) { | 67 if (!current_frame_.get() || IsOpaque(current_frame_) != IsOpaque(frame)) { |
| 68 opacity_changed_cb_.Run(IsOpaque(frame)); | 68 opacity_changed_cb_.Run(IsOpaque(frame)); |
| 69 } | 69 } |
| 70 | 70 |
| 71 current_frame_ = frame; | 71 current_frame_ = frame; |
| 72 | 72 |
| 73 if (client_) | 73 if (client_) |
| 74 client_->DidReceiveFrame(); | 74 client_->DidReceiveFrame(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 } // namespace content | 77 } // namespace content |
| OLD | NEW |