| Index: media/renderers/video_renderer_impl.h
|
| diff --git a/media/renderers/video_renderer_impl.h b/media/renderers/video_renderer_impl.h
|
| index 3938364eb1177efb3f1770984eee3123f931f31e..975b0296b98d9fc592f79ffe7c78cadf39255e6f 100644
|
| --- a/media/renderers/video_renderer_impl.h
|
| +++ b/media/renderers/video_renderer_impl.h
|
| @@ -8,7 +8,6 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| -#include <deque>
|
| #include <memory>
|
|
|
| #include "base/macros.h"
|
| @@ -22,6 +21,7 @@
|
| #include "media/base/demuxer_stream.h"
|
| #include "media/base/media_log.h"
|
| #include "media/base/pipeline_status.h"
|
| +#include "media/base/stream_position.h"
|
| #include "media/base/video_decoder.h"
|
| #include "media/base/video_frame.h"
|
| #include "media/base/video_renderer.h"
|
| @@ -38,9 +38,9 @@ class TickClock;
|
|
|
| namespace media {
|
|
|
| -// VideoRendererImpl handles reading from a VideoFrameStream storing the
|
| -// results in a queue of decoded frames and executing a callback when a frame is
|
| -// ready for rendering.
|
| +// VideoRendererImpl handles reading from a VideoFrameStream, storing the
|
| +// results in a queue of decoded frames, and selecting the best one for display
|
| +// in response to Render() calls.
|
| class MEDIA_EXPORT VideoRendererImpl
|
| : public VideoRenderer,
|
| public NON_EXPORTED_BASE(VideoRendererSink::RenderCallback) {
|
| @@ -69,7 +69,7 @@ class MEDIA_EXPORT VideoRendererImpl
|
| const TimeSource::WallClockTimeCB& wall_clock_time_cb,
|
| const PipelineStatusCB& init_cb) override;
|
| void Flush(const base::Closure& callback) override;
|
| - void StartPlayingFrom(base::TimeDelta timestamp) override;
|
| + void StartPlayingFrom(StreamPosition position) override;
|
| void OnTimeStateChanged(bool time_progressing) override;
|
|
|
| void SetTickClockForTesting(std::unique_ptr<base::TickClock> tick_clock);
|
| @@ -108,7 +108,7 @@ class MEDIA_EXPORT VideoRendererImpl
|
| void FrameReady(VideoFrameStream::Status status,
|
| const scoped_refptr<VideoFrame>& frame);
|
|
|
| - // Helper method for enqueueing a frame to |alogorithm_|.
|
| + // Helper method for enqueueing a frame to |algorithm_|.
|
| void AddReadyFrame_Locked(const scoped_refptr<VideoFrame>& frame);
|
|
|
| // Helper method that schedules an asynchronous read from the
|
| @@ -252,6 +252,8 @@ class MEDIA_EXPORT VideoRendererImpl
|
| base::Closure flush_cb_;
|
| TimeSource::WallClockTimeCB wall_clock_time_cb_;
|
|
|
| + bool start_rendering_from_first_frame_;
|
| +
|
| base::TimeDelta start_timestamp_;
|
|
|
| // Keeps track of the number of frames decoded and dropped since the
|
|
|