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/time_delta_interpolator.h" | 5 #include "media/base/time_delta_interpolator.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 | 10 |
(...skipping 28 matching lines...) Expand all Loading... |
39 return lower_bound_; | 39 return lower_bound_; |
40 } | 40 } |
41 | 41 |
42 void TimeDeltaInterpolator::SetPlaybackRate(double playback_rate) { | 42 void TimeDeltaInterpolator::SetPlaybackRate(double playback_rate) { |
43 lower_bound_ = GetInterpolatedTime(); | 43 lower_bound_ = GetInterpolatedTime(); |
44 reference_ = tick_clock_->NowTicks(); | 44 reference_ = tick_clock_->NowTicks(); |
45 playback_rate_ = playback_rate; | 45 playback_rate_ = playback_rate; |
46 } | 46 } |
47 | 47 |
48 void TimeDeltaInterpolator::SetBounds(base::TimeDelta lower_bound, | 48 void TimeDeltaInterpolator::SetBounds(base::TimeDelta lower_bound, |
49 base::TimeDelta upper_bound) { | 49 base::TimeDelta upper_bound, |
| 50 base::TimeTicks capture_time) { |
50 DCHECK(lower_bound <= upper_bound); | 51 DCHECK(lower_bound <= upper_bound); |
51 DCHECK(lower_bound != kNoTimestamp); | 52 DCHECK(lower_bound != kNoTimestamp); |
52 | 53 |
53 lower_bound_ = std::max(base::TimeDelta(), lower_bound); | 54 lower_bound_ = std::max(base::TimeDelta(), lower_bound); |
54 upper_bound_ = std::max(base::TimeDelta(), upper_bound); | 55 upper_bound_ = std::max(base::TimeDelta(), upper_bound); |
55 reference_ = tick_clock_->NowTicks(); | 56 reference_ = capture_time; |
56 } | 57 } |
57 | 58 |
58 void TimeDeltaInterpolator::SetUpperBound(base::TimeDelta upper_bound) { | 59 void TimeDeltaInterpolator::SetUpperBound(base::TimeDelta upper_bound) { |
59 DCHECK(upper_bound != kNoTimestamp); | 60 DCHECK(upper_bound != kNoTimestamp); |
60 | 61 |
61 lower_bound_ = GetInterpolatedTime(); | 62 lower_bound_ = GetInterpolatedTime(); |
62 reference_ = tick_clock_->NowTicks(); | 63 reference_ = tick_clock_->NowTicks(); |
63 upper_bound_ = upper_bound; | 64 upper_bound_ = upper_bound; |
64 } | 65 } |
65 | 66 |
66 base::TimeDelta TimeDeltaInterpolator::GetInterpolatedTime() { | 67 base::TimeDelta TimeDeltaInterpolator::GetInterpolatedTime() { |
67 if (!interpolating_) | 68 if (!interpolating_) |
68 return lower_bound_; | 69 return lower_bound_; |
69 | 70 |
70 int64_t now_us = (tick_clock_->NowTicks() - reference_).InMicroseconds(); | 71 int64_t now_us = (tick_clock_->NowTicks() - reference_).InMicroseconds(); |
71 now_us = static_cast<int64_t>(now_us * playback_rate_); | 72 now_us = static_cast<int64_t>(now_us * playback_rate_); |
72 base::TimeDelta interpolated_time = | 73 base::TimeDelta interpolated_time = |
73 lower_bound_ + base::TimeDelta::FromMicroseconds(now_us); | 74 lower_bound_ + base::TimeDelta::FromMicroseconds(now_us); |
74 | 75 |
75 if (upper_bound_ == kNoTimestamp) | 76 if (upper_bound_ == kNoTimestamp) |
76 return interpolated_time; | 77 return interpolated_time; |
77 | 78 |
78 return std::min(interpolated_time, upper_bound_); | 79 return std::min(interpolated_time, upper_bound_); |
79 } | 80 } |
80 | 81 |
81 } // namespace media | 82 } // namespace media |
OLD | NEW |