Chromium Code Reviews| Index: media/renderers/renderer_impl.cc |
| diff --git a/media/renderers/renderer_impl.cc b/media/renderers/renderer_impl.cc |
| index 8efe432a7ccd64f8fb5dc982ff2a17b415fbe05d..63c4a5f7a1f9c059bd058fc187c6ef57e3508001 100644 |
| --- a/media/renderers/renderer_impl.cc |
| +++ b/media/renderers/renderer_impl.cc |
| @@ -238,8 +238,15 @@ bool RendererImpl::GetWallClockTimes( |
| // 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_) { |
| - *wall_clock_times = std::vector<base::TimeTicks>(media_timestamps.size(), |
| - base::TimeTicks::Now()); |
| + if (media_timestamps.empty()) { |
| + *wall_clock_times = std::vector<base::TimeTicks>(1, |
|
DaleCurtis
2015/07/01 21:42:29
wall clock times should be empty, so add a DCHECK(
|
| + base::TimeTicks::Now()); |
| + } else { |
| + *wall_clock_times = std::vector<base::TimeTicks>(); |
| + for (auto const &media_time : media_timestamps) { |
| + wall_clock_times->push_back(base::TimeTicks() + media_time); |
| + } |
| + } |
| return true; |
| } |