Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(355)

Side by Side Diff: media/base/time_delta_interpolator.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/text_renderer_unittest.cc ('k') | media/base/user_input_monitor.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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>
8
7 #include <algorithm> 9 #include <algorithm>
8 10
9 #include "base/logging.h" 11 #include "base/logging.h"
10 #include "base/time/tick_clock.h" 12 #include "base/time/tick_clock.h"
11 #include "media/base/timestamp_constants.h" 13 #include "media/base/timestamp_constants.h"
12 14
13 namespace media { 15 namespace media {
14 16
15 TimeDeltaInterpolator::TimeDeltaInterpolator(base::TickClock* tick_clock) 17 TimeDeltaInterpolator::TimeDeltaInterpolator(base::TickClock* tick_clock)
16 : tick_clock_(tick_clock), 18 : tick_clock_(tick_clock),
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 base::TimeDelta interpolated_time = 72 base::TimeDelta interpolated_time =
71 lower_bound_ + base::TimeDelta::FromMicroseconds(now_us); 73 lower_bound_ + base::TimeDelta::FromMicroseconds(now_us);
72 74
73 if (upper_bound_ == kNoTimestamp()) 75 if (upper_bound_ == kNoTimestamp())
74 return interpolated_time; 76 return interpolated_time;
75 77
76 return std::min(interpolated_time, upper_bound_); 78 return std::min(interpolated_time, upper_bound_);
77 } 79 }
78 80
79 } // namespace media 81 } // namespace media
OLDNEW
« no previous file with comments | « media/base/text_renderer_unittest.cc ('k') | media/base/user_input_monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698