| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/clock.h" | 5 #include "media/base/clock.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "media/base/buffers.h" | 8 #include "media/base/buffers.h" |
| 9 | 9 |
| 10 namespace media { | 10 namespace media { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 void Clock::SetPlaybackRate(float playback_rate) { | 39 void Clock::SetPlaybackRate(float playback_rate) { |
| 40 if (playing_) { | 40 if (playing_) { |
| 41 base::Time time = GetTimeFromProvider(); | 41 base::Time time = GetTimeFromProvider(); |
| 42 media_time_ = ElapsedViaProvidedTime(time); | 42 media_time_ = ElapsedViaProvidedTime(time); |
| 43 reference_ = time; | 43 reference_ = time; |
| 44 } | 44 } |
| 45 playback_rate_ = playback_rate; | 45 playback_rate_ = playback_rate; |
| 46 } | 46 } |
| 47 | 47 |
| 48 void Clock::SetTime(const base::TimeDelta& time) { | 48 void Clock::SetTime(const base::TimeDelta& time) { |
| 49 if (time == kNoTimestamp) { | 49 if (time == kNoTimestamp()) { |
| 50 NOTREACHED(); | 50 NOTREACHED(); |
| 51 return; | 51 return; |
| 52 } | 52 } |
| 53 if (playing_) { | 53 if (playing_) { |
| 54 reference_ = GetTimeFromProvider(); | 54 reference_ = GetTimeFromProvider(); |
| 55 } | 55 } |
| 56 media_time_ = time; | 56 media_time_ = time; |
| 57 } | 57 } |
| 58 | 58 |
| 59 base::TimeDelta Clock::Elapsed() const { | 59 base::TimeDelta Clock::Elapsed() const { |
| (...skipping 11 matching lines...) Expand all Loading... |
| 71 } | 71 } |
| 72 | 72 |
| 73 base::Time Clock::GetTimeFromProvider() const { | 73 base::Time Clock::GetTimeFromProvider() const { |
| 74 if (time_provider_) { | 74 if (time_provider_) { |
| 75 return time_provider_(); | 75 return time_provider_(); |
| 76 } | 76 } |
| 77 return base::Time(); | 77 return base::Time(); |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace media | 80 } // namespace media |
| OLD | NEW |