Chromium Code Reviews| Index: media/cast/cast_defines.h |
| diff --git a/media/cast/cast_defines.h b/media/cast/cast_defines.h |
| index 76e252716e0bbd774d56857dea26cf58aceb3625..0be66d2b23031f61e3fdccac96e81cfa05b34fce 100644 |
| --- a/media/cast/cast_defines.h |
| +++ b/media/cast/cast_defines.h |
| @@ -178,9 +178,10 @@ inline void ConvertTimeTicksToNtp(const base::TimeTicks& time, |
| inline base::TimeTicks ConvertNtpToTimeTicks(uint32 ntp_seconds, |
| uint32 ntp_fractions) { |
| - int64 ntp_time_us = |
| - static_cast<int64>(ntp_seconds) * base::Time::kMicrosecondsPerSecond + |
| - static_cast<int64>(ntp_fractions) / kMagicFractionalUnit; |
| + // We need to ceil() here because the calculation of |fractions| in |
|
wolenetz
2014/10/21 19:15:15
nit: fix compilation by #including std::ceil
Peter Kasting
2014/10/21 19:34:47
Done.
|
| + // ConvertTimeToFractions() effectively does a floor(). |
| + int64 ntp_time_us = ntp_seconds * base::Time::kMicrosecondsPerSecond + |
| + static_cast<int64>(std::ceil(ntp_fractions / kMagicFractionalUnit)); |
|
wolenetz
2014/10/21 19:15:15
Though this works for the unit tests' hardcoded ti
wolenetz
2014/10/21 19:22:00
From offline chat w/pkasting@, the behavior-invari
Peter Kasting
2014/10/21 19:34:47
More detail:
ceil() here is correct if we're tryi
|
| base::TimeDelta elapsed_since_unix_epoch = base::TimeDelta::FromMicroseconds( |
| ntp_time_us - |