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

Unified Diff: media/base/wall_clock_time_source.cc

Issue 1136513004: Switch GetWallClockTime to using vectors for input and output. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use vector. Cleanup. Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: media/base/wall_clock_time_source.cc
diff --git a/media/base/wall_clock_time_source.cc b/media/base/wall_clock_time_source.cc
index 036930671babe5bcac3cafc19f137c543c84ac94..07da43b7020282e7da3be1092e1c10682081ef7e 100644
--- a/media/base/wall_clock_time_source.cc
+++ b/media/base/wall_clock_time_source.cc
@@ -5,12 +5,11 @@
#include "media/base/wall_clock_time_source.h"
#include "base/logging.h"
-#include "base/time/default_tick_clock.h"
namespace media {
WallClockTimeSource::WallClockTimeSource()
- : tick_clock_(new base::DefaultTickClock()),
+ : tick_clock_(&default_tick_clock_),
ticking_(false),
playback_rate_(1.0) {
}
@@ -60,25 +59,27 @@ base::TimeDelta WallClockTimeSource::CurrentMediaTime() {
return CurrentMediaTime_Locked();
}
-base::TimeTicks WallClockTimeSource::GetWallClockTime(base::TimeDelta time) {
+bool WallClockTimeSource::GetWallClockTime(
+ const std::vector<base::TimeDelta>& media_timestamps,
+ std::vector<base::TimeTicks>* wall_clock_times) {
base::AutoLock auto_lock(lock_);
- if (!ticking_ || playback_rate_ == 0.0)
- return base::TimeTicks();
-
- // See notes about |time| values less than |base_time_| in TimeSource header.
- return reference_wall_ticks_ +
- base::TimeDelta::FromMicroseconds(
- (time - base_time_).InMicroseconds() / playback_rate_);
-}
-
-void WallClockTimeSource::SetTickClockForTesting(
- scoped_ptr<base::TickClock> tick_clock) {
- tick_clock_.swap(tick_clock);
+ if (!ticking_ || !playback_rate_)
+ return false;
+
+ DCHECK(wall_clock_times->empty());
+ wall_clock_times->reserve(media_timestamps.size());
+ for (const auto& media_timestamp : media_timestamps) {
+ wall_clock_times->push_back(
+ reference_wall_ticks_ +
+ base::TimeDelta::FromMicroseconds(
+ (media_timestamp - base_time_).InMicroseconds() / playback_rate_));
+ }
+ return true;
}
base::TimeDelta WallClockTimeSource::CurrentMediaTime_Locked() {
lock_.AssertAcquired();
- if (!ticking_ || playback_rate_ == 0.0)
+ if (!ticking_ || !playback_rate_)
return base_time_;
base::TimeTicks now = tick_clock_->NowTicks();

Powered by Google App Engine
This is Rietveld 408576698