| Index: media/cast/cast_defines.h
|
| diff --git a/media/cast/cast_defines.h b/media/cast/cast_defines.h
|
| index 0778638551eec7f9559bb5e6190549c396a90baf..a249e3886131b0983cf727c72fa8f113c4ea10a3 100644
|
| --- a/media/cast/cast_defines.h
|
| +++ b/media/cast/cast_defines.h
|
| @@ -58,12 +58,6 @@ typedef std::map<uint8, PacketIdSet> MissingFramesAndPacketsMap;
|
| // fractional NTP seconds.
|
| static const double kMagicFractionalUnit = 4.294967296E3;
|
|
|
| -// Network Time Protocol (NTP), which is in seconds relative to 0h UTC on
|
| -// 1 January 1900.
|
| -static const int64 kNtpEpochDeltaSeconds = GG_INT64_C(9435484800);
|
| -static const int64 kNtpEpochDeltaMicroseconds =
|
| - kNtpEpochDeltaSeconds * base::Time::kMicrosecondsPerSecond;
|
| -
|
| inline bool IsNewerFrameId(uint8 frame_id, uint8 prev_frame_id) {
|
| return (frame_id != prev_frame_id) &&
|
| static_cast<uint8>(frame_id - prev_frame_id) < 0x80;
|
| @@ -107,20 +101,12 @@ inline void ConvertTimeToFractions(int64 time_us,
|
| (time_us % base::Time::kMicrosecondsPerSecond) * kMagicFractionalUnit);
|
| }
|
|
|
| -inline void ConvertTimeToNtp(const base::TimeTicks& time,
|
| - uint32* ntp_seconds,
|
| - uint32* ntp_fractions) {
|
| - int64 time_us = time.ToInternalValue() - kNtpEpochDeltaMicroseconds;
|
| - ConvertTimeToFractions(time_us, ntp_seconds, ntp_fractions);
|
| -}
|
| -
|
| inline base::TimeTicks ConvertNtpToTime(uint32 ntp_seconds,
|
| uint32 ntp_fractions) {
|
| int64 ntp_time_us = static_cast<int64>(ntp_seconds) *
|
| base::Time::kMicrosecondsPerSecond;
|
| ntp_time_us += static_cast<int64>(ntp_fractions) / kMagicFractionalUnit;
|
| - return base::TimeTicks::FromInternalValue(ntp_time_us +
|
| - kNtpEpochDeltaMicroseconds);
|
| + return base::TimeTicks::FromInternalValue(ntp_time_us);
|
| }
|
|
|
| } // namespace cast
|
|
|