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

Unified Diff: media/renderers/renderer_impl.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: Fix comments. 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
« no previous file with comments | « media/renderers/renderer_impl.h ('k') | media/renderers/video_renderer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/renderer_impl.cc
diff --git a/media/renderers/renderer_impl.cc b/media/renderers/renderer_impl.cc
index 30eeb4fc1d88df5fc1b744ea3ddcefbae3dbbd56..c06553a0d7dc9f955352b26b57cd066208df6fa7 100644
--- a/media/renderers/renderer_impl.cc
+++ b/media/renderers/renderer_impl.cc
@@ -229,16 +229,21 @@ void RendererImpl::EnableClocklessVideoPlaybackForTesting() {
clockless_video_playback_enabled_for_testing_ = true;
}
-base::TimeTicks RendererImpl::GetWallClockTime(base::TimeDelta time) {
+bool RendererImpl::GetWallClockTimes(
+ const std::vector<base::TimeDelta>& media_timestamps,
+ std::vector<base::TimeTicks>* wall_clock_times) {
// No BelongsToCurrentThread() checking because this can be called from other
// threads.
//
// TODO(scherkus): Currently called from VideoRendererImpl's internal thread,
// which should go away at some point http://crbug.com/110814
- if (clockless_video_playback_enabled_for_testing_)
- return base::TimeTicks::Now();
+ if (clockless_video_playback_enabled_for_testing_) {
+ *wall_clock_times = std::vector<base::TimeTicks>(media_timestamps.size(),
+ base::TimeTicks::Now());
+ return true;
+ }
- return time_source_->GetWallClockTime(time);
+ return time_source_->GetWallClockTimes(media_timestamps, wall_clock_times);
}
void RendererImpl::SetDecryptorReadyCallback(
@@ -336,7 +341,7 @@ void RendererImpl::InitializeVideoRenderer() {
&video_buffering_state_),
base::Bind(&RendererImpl::OnVideoRendererEnded, weak_this_),
base::Bind(&RendererImpl::OnError, weak_this_),
- base::Bind(&RendererImpl::GetWallClockTime, base::Unretained(this)),
+ base::Bind(&RendererImpl::GetWallClockTimes, base::Unretained(this)),
waiting_for_decryption_key_cb_);
}
« no previous file with comments | « media/renderers/renderer_impl.h ('k') | media/renderers/video_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698