| Index: media/renderers/renderer_impl.cc
|
| diff --git a/media/renderers/renderer_impl.cc b/media/renderers/renderer_impl.cc
|
| index 30eeb4fc1d88df5fc1b744ea3ddcefbae3dbbd56..d151abed2239ce9a3dc94d36258f293b2fe7dc92 100644
|
| --- a/media/renderers/renderer_impl.cc
|
| +++ b/media/renderers/renderer_impl.cc
|
| @@ -229,16 +229,21 @@ void RendererImpl::EnableClocklessVideoPlaybackForTesting() {
|
| clockless_video_playback_enabled_for_testing_ = true;
|
| }
|
|
|
| -base::TimeTicks RendererImpl::GetWallClockTime(base::TimeDelta time) {
|
| +bool RendererImpl::GetWallClockTime(
|
| + const std::vector<base::TimeDelta>& media_timestamps,
|
| + std::vector<base::TimeTicks>* wall_clock_times) {
|
| // No BelongsToCurrentThread() checking because this can be called from other
|
| // threads.
|
| //
|
| // TODO(scherkus): Currently called from VideoRendererImpl's internal thread,
|
| // which should go away at some point http://crbug.com/110814
|
| - if (clockless_video_playback_enabled_for_testing_)
|
| - return base::TimeTicks::Now();
|
| + if (clockless_video_playback_enabled_for_testing_) {
|
| + *wall_clock_times = std::vector<base::TimeTicks>(media_timestamps.size(),
|
| + base::TimeTicks::Now());
|
| + return true;
|
| + }
|
|
|
| - return time_source_->GetWallClockTime(time);
|
| + return time_source_->GetWallClockTime(media_timestamps, wall_clock_times);
|
| }
|
|
|
| void RendererImpl::SetDecryptorReadyCallback(
|
|
|