| 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 "media/base/wall_clock_time_source.h" | 5 #include "media/base/wall_clock_time_source.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/time/default_tick_clock.h" | 8 #include "base/time/default_tick_clock.h" |
| 9 | 9 |
| 10 namespace media { | 10 namespace media { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 } | 61 } |
| 62 | 62 |
| 63 base::TimeTicks WallClockTimeSource::GetWallClockTime(base::TimeDelta time) { | 63 base::TimeTicks WallClockTimeSource::GetWallClockTime(base::TimeDelta time) { |
| 64 base::AutoLock auto_lock(lock_); | 64 base::AutoLock auto_lock(lock_); |
| 65 if (!ticking_ || playback_rate_ == 0.0) | 65 if (!ticking_ || playback_rate_ == 0.0) |
| 66 return base::TimeTicks(); | 66 return base::TimeTicks(); |
| 67 | 67 |
| 68 // See notes about |time| values less than |base_time_| in TimeSource header. | 68 // See notes about |time| values less than |base_time_| in TimeSource header. |
| 69 return reference_wall_ticks_ + | 69 return reference_wall_ticks_ + |
| 70 base::TimeDelta::FromMicroseconds( | 70 base::TimeDelta::FromMicroseconds( |
| 71 (time - base_time_).InMicroseconds() * playback_rate_); | 71 (time - base_time_).InMicroseconds() / playback_rate_); |
| 72 } | 72 } |
| 73 | 73 |
| 74 void WallClockTimeSource::SetTickClockForTesting( | 74 void WallClockTimeSource::SetTickClockForTesting( |
| 75 scoped_ptr<base::TickClock> tick_clock) { | 75 scoped_ptr<base::TickClock> tick_clock) { |
| 76 tick_clock_.swap(tick_clock); | 76 tick_clock_.swap(tick_clock); |
| 77 } | 77 } |
| 78 | 78 |
| 79 base::TimeDelta WallClockTimeSource::CurrentMediaTime_Locked() { | 79 base::TimeDelta WallClockTimeSource::CurrentMediaTime_Locked() { |
| 80 lock_.AssertAcquired(); | 80 lock_.AssertAcquired(); |
| 81 if (!ticking_ || playback_rate_ == 0.0) | 81 if (!ticking_ || playback_rate_ == 0.0) |
| 82 return base_time_; | 82 return base_time_; |
| 83 | 83 |
| 84 base::TimeTicks now = tick_clock_->NowTicks(); | 84 base::TimeTicks now = tick_clock_->NowTicks(); |
| 85 return base_time_ + | 85 return base_time_ + |
| 86 base::TimeDelta::FromMicroseconds( | 86 base::TimeDelta::FromMicroseconds( |
| 87 (now - reference_wall_ticks_).InMicroseconds() * playback_rate_); | 87 (now - reference_wall_ticks_).InMicroseconds() * playback_rate_); |
| 88 } | 88 } |
| 89 | 89 |
| 90 } // namespace media | 90 } // namespace media |
| OLD | NEW |