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

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

Issue 557333002: Revert of Switch to using media::TimeSource inside media::RendererImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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/wall_clock_time_source.h ('k') | media/filters/audio_renderer_impl.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/wall_clock_time_source.h" 5 #include "media/base/wall_clock_time_source.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/time/default_tick_clock.h" 8 #include "base/time/default_tick_clock.h"
9 9
10 namespace media { 10 namespace media {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 base::TimeDelta WallClockTimeSource::CurrentMediaTime() { 50 base::TimeDelta WallClockTimeSource::CurrentMediaTime() {
51 if (!ticking_) 51 if (!ticking_)
52 return base_time_; 52 return base_time_;
53 53
54 base::TimeTicks now = tick_clock_->NowTicks(); 54 base::TimeTicks now = tick_clock_->NowTicks();
55 return base_time_ + 55 return base_time_ +
56 base::TimeDelta::FromMicroseconds( 56 base::TimeDelta::FromMicroseconds(
57 (now - reference_wall_ticks_).InMicroseconds() * playback_rate_); 57 (now - reference_wall_ticks_).InMicroseconds() * playback_rate_);
58 } 58 }
59 59
60 base::TimeDelta WallClockTimeSource::CurrentMediaTimeForSyncingVideo() {
61 return CurrentMediaTime();
62 }
63
64 void WallClockTimeSource::SetTickClockForTesting( 60 void WallClockTimeSource::SetTickClockForTesting(
65 scoped_ptr<base::TickClock> tick_clock) { 61 scoped_ptr<base::TickClock> tick_clock) {
66 tick_clock_.swap(tick_clock); 62 tick_clock_.swap(tick_clock);
67 } 63 }
68 64
69 } // namespace media 65 } // namespace media
OLDNEW
« no previous file with comments | « media/base/wall_clock_time_source.h ('k') | media/filters/audio_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698