Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / media / base / wall_clock_time_source.cc

diff --git a/src/media/base/wall_clock_time_source.cc b/src/media/base/wall_clock_time_source.cc
index 67b16f7..408de93 100644 (file)
--- a/src/media/base/wall_clock_time_source.cc
+++ b/src/media/base/wall_clock_time_source.cc
@@ -19,23 +19,29 @@ WallClockTimeSource::~WallClockTimeSource() {
 }
 
 void WallClockTimeSource::StartTicking() {
+  DVLOG(1) << __FUNCTION__;
+  base::AutoLock auto_lock(lock_);
   DCHECK(!ticking_);
   ticking_ = true;
   reference_wall_ticks_ = tick_clock_->NowTicks();
 }
 
 void WallClockTimeSource::StopTicking() {
+  DVLOG(1) << __FUNCTION__;
+  base::AutoLock auto_lock(lock_);
   DCHECK(ticking_);
-  base_time_ = CurrentMediaTime();
+  base_time_ = CurrentMediaTime_Locked();
   ticking_ = false;
   reference_wall_ticks_ = tick_clock_->NowTicks();
 }
 
 void WallClockTimeSource::SetPlaybackRate(float playback_rate) {
+  DVLOG(1) << __FUNCTION__ << "(" << playback_rate << ")";
+  base::AutoLock auto_lock(lock_);
   // Estimate current media time using old rate to use as a new base time for
   // the new rate.
   if (ticking_) {
-    base_time_ = CurrentMediaTime();
+    base_time_ = CurrentMediaTime_Locked();
     reference_wall_ticks_ = tick_clock_->NowTicks();
   }
 
@@ -43,11 +49,28 @@ void WallClockTimeSource::SetPlaybackRate(float playback_rate) {
 }
 
 void WallClockTimeSource::SetMediaTime(base::TimeDelta time) {
+  DVLOG(1) << __FUNCTION__ << "(" << time.InMicroseconds() << ")";
+  base::AutoLock auto_lock(lock_);
   CHECK(!ticking_);
   base_time_ = time;
 }
 
 base::TimeDelta WallClockTimeSource::CurrentMediaTime() {
+  base::AutoLock auto_lock(lock_);
+  return CurrentMediaTime_Locked();
+}
+
+base::TimeDelta WallClockTimeSource::CurrentMediaTimeForSyncingVideo() {
+  return CurrentMediaTime();
+}
+
+void WallClockTimeSource::SetTickClockForTesting(
+    scoped_ptr<base::TickClock> tick_clock) {
+  tick_clock_.swap(tick_clock);
+}
+
+base::TimeDelta WallClockTimeSource::CurrentMediaTime_Locked() {
+  lock_.AssertAcquired();
   if (!ticking_)
     return base_time_;
 
@@ -57,9 +80,4 @@ base::TimeDelta WallClockTimeSource::CurrentMediaTime() {
              (now - reference_wall_ticks_).InMicroseconds() * playback_rate_);
 }
 
-void WallClockTimeSource::SetTickClockForTesting(
-    scoped_ptr<base::TickClock> tick_clock) {
-  tick_clock_.swap(tick_clock);
-}
-
 }  // namespace media