Index: chromecast/media/cma/backend/media_clock_device_default.cc |
diff --git a/chromecast/media/cma/backend/media_clock_device_default.cc b/chromecast/media/cma/backend/media_clock_device_default.cc |
index 086083dda3f3721b6726af4aa41d7805a552ad7b..2a85c09f080ed6d6e25854efa6561a4ecaac5ecf 100644 |
--- a/chromecast/media/cma/backend/media_clock_device_default.cc |
+++ b/chromecast/media/cma/backend/media_clock_device_default.cc |
@@ -4,27 +4,27 @@ |
#include "chromecast/media/cma/backend/media_clock_device_default.h" |
+#include "chromecast/base/time_conversions.h" |
#include "media/base/buffers.h" |
namespace chromecast { |
namespace media { |
MediaClockDeviceDefault::MediaClockDeviceDefault() |
- : state_(kStateUninitialized), |
- media_time_(::media::kNoTimestamp()) { |
- DetachFromThread(); |
+ : state_(kStateUninitialized), media_time_(TimeDelta::Invalid()) { |
+ thread_checker_.DetachFromThread(); |
} |
MediaClockDeviceDefault::~MediaClockDeviceDefault() { |
} |
MediaClockDevice::State MediaClockDeviceDefault::GetState() const { |
- DCHECK(CalledOnValidThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
return state_; |
} |
bool MediaClockDeviceDefault::SetState(State new_state) { |
- DCHECK(CalledOnValidThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
if (!MediaClockDevice::IsValidStateTransition(state_, new_state)) |
return false; |
@@ -35,30 +35,30 @@ bool MediaClockDeviceDefault::SetState(State new_state) { |
if (state_ == kStateRunning) { |
stc_ = base::TimeTicks::Now(); |
- DCHECK(media_time_ != ::media::kNoTimestamp()); |
+ DCHECK(media_time_ != TimeDelta::Invalid()); |
return true; |
} |
if (state_ == kStateIdle) { |
- media_time_ = ::media::kNoTimestamp(); |
+ media_time_ = TimeDelta::Invalid(); |
return true; |
} |
return true; |
} |
-bool MediaClockDeviceDefault::ResetTimeline(base::TimeDelta time) { |
- DCHECK(CalledOnValidThread()); |
+bool MediaClockDeviceDefault::ResetTimeline(TimeDelta time) { |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
DCHECK_EQ(state_, kStateIdle); |
media_time_ = time; |
return true; |
} |
bool MediaClockDeviceDefault::SetRate(float rate) { |
- DCHECK(CalledOnValidThread()); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
if (state_ == kStateRunning) { |
base::TimeTicks now = base::TimeTicks::Now(); |
- media_time_ = media_time_ + (now - stc_) * rate_; |
+ media_time_ = media_time_ + FromBaseTimeDelta((now - stc_) * rate_); |
stc_ = now; |
} |
@@ -66,17 +66,17 @@ bool MediaClockDeviceDefault::SetRate(float rate) { |
return true; |
} |
-base::TimeDelta MediaClockDeviceDefault::GetTime() { |
- DCHECK(CalledOnValidThread()); |
+TimeDelta MediaClockDeviceDefault::GetTime() { |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
if (state_ != kStateRunning) |
return media_time_; |
- if (media_time_ == ::media::kNoTimestamp()) |
- return ::media::kNoTimestamp(); |
+ if (media_time_ == TimeDelta::Invalid()) |
+ return TimeDelta::Invalid(); |
base::TimeTicks now = base::TimeTicks::Now(); |
- base::TimeDelta interpolated_media_time = |
- media_time_ + (now - stc_) * rate_; |
+ TimeDelta interpolated_media_time = |
+ media_time_ + FromBaseTimeDelta((now - stc_) * rate_); |
return interpolated_media_time; |
} |