| 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 #ifndef MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ | 5 #ifndef MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ |
| 6 #define MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ | 6 #define MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 9 #include "media/base/media_export.h" | 10 #include "media/base/media_export.h" |
| 10 | 11 |
| 11 namespace base { | 12 namespace base { |
| 12 class TickClock; | 13 class TickClock; |
| 13 } // namespace base | 14 } // namespace base |
| 14 | 15 |
| 15 namespace media { | 16 namespace media { |
| 16 | 17 |
| 17 // Interpolates between two TimeDeltas based on the passage of wall clock time | 18 // Interpolates between two TimeDeltas based on the passage of wall clock time |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 base::TimeTicks reference_; | 73 base::TimeTicks reference_; |
| 73 | 74 |
| 74 double playback_rate_; | 75 double playback_rate_; |
| 75 | 76 |
| 76 DISALLOW_COPY_AND_ASSIGN(TimeDeltaInterpolator); | 77 DISALLOW_COPY_AND_ASSIGN(TimeDeltaInterpolator); |
| 77 }; | 78 }; |
| 78 | 79 |
| 79 } // namespace media | 80 } // namespace media |
| 80 | 81 |
| 81 #endif // MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ | 82 #endif // MEDIA_BASE_TIME_DELTA_INTERPOLATOR_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1535193003:
Add missing macros includes in media/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master