Chromium Code Reviews| 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 #ifndef MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ | 5 #ifndef MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ | 
| 6 #define MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ | 6 #define MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ | 
| 7 | 7 | 
| 8 #include <utility> | 8 #include <utility> | 
| 9 | 9 | 
| 10 #include "base/callback.h" | 10 #include "base/callback.h" | 
| 11 #include "base/macros.h" | 11 #include "base/macros.h" | 
| 12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" | 
| 13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" | 
| 14 #include "base/synchronization/lock.h" | 14 #include "base/synchronization/lock.h" | 
| 15 #include "base/time/tick_clock.h" | 15 #include "base/time/tick_clock.h" | 
| 16 #include "base/timer/timer.h" | 16 #include "base/timer/timer.h" | 
| 17 #include "base/trace_event/video_playback_pae.h" | |
| 17 #include "cc/layers/video_frame_provider.h" | 18 #include "cc/layers/video_frame_provider.h" | 
| 18 #include "media/base/video_renderer_sink.h" | 19 #include "media/base/video_renderer_sink.h" | 
| 19 #include "media/blink/media_blink_export.h" | 20 #include "media/blink/media_blink_export.h" | 
| 20 #include "ui/gfx/geometry/size.h" | 21 #include "ui/gfx/geometry/size.h" | 
| 21 | 22 | 
| 22 namespace media { | 23 namespace media { | 
| 23 class VideoFrame; | 24 class VideoFrame; | 
| 24 | 25 | 
| 25 // VideoFrameCompositor acts as a bridge between the media and cc layers for | 26 // VideoFrameCompositor acts as a bridge between the media and cc layers for | 
| 26 // rendering video frames. I.e. a media::VideoRenderer will talk to this class | 27 // rendering video frames. I.e. a media::VideoRenderer will talk to this class | 
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 153 base::TimeTicks last_background_render_; | 154 base::TimeTicks last_background_render_; | 
| 154 | 155 | 
| 155 // These values are set on the compositor thread, but also read on the media | 156 // These values are set on the compositor thread, but also read on the media | 
| 156 // thread when the VFC is stopped. | 157 // thread when the VFC is stopped. | 
| 157 scoped_refptr<VideoFrame> current_frame_; | 158 scoped_refptr<VideoFrame> current_frame_; | 
| 158 | 159 | 
| 159 // These values are updated and read from the media and compositor threads. | 160 // These values are updated and read from the media and compositor threads. | 
| 160 base::Lock callback_lock_; | 161 base::Lock callback_lock_; | 
| 161 VideoRendererSink::RenderCallback* callback_; | 162 VideoRendererSink::RenderCallback* callback_; | 
| 162 | 163 | 
| 164 // Persistent async event | |
| 165 base::trace_event::VideoPlaybackPersistentAsyncEvent* persistent_async_; | |
| 
 
DaleCurtis
2016/08/29 21:43:15
Seems like this should be an std::unique_ptr<> unl
 
alexandermont
2016/08/30 19:01:22
Done
 
 | |
| 166 | |
| 163 DISALLOW_COPY_AND_ASSIGN(VideoFrameCompositor); | 167 DISALLOW_COPY_AND_ASSIGN(VideoFrameCompositor); | 
| 164 }; | 168 }; | 
| 165 | 169 | 
| 166 } // namespace media | 170 } // namespace media | 
| 167 | 171 | 
| 168 #endif // MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ | 172 #endif // MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_ | 
| OLD | NEW |