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

Unified Diff: media/renderers/renderer_impl.cc

Issue 1027553002: Change the TimeSource interface to return wallclock time for video. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove underflow changes. Created 5 years, 9 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 936718512a029f93072ba81a4ed6123ec3683323..e81c97aec4996f8904ca330c128dfa984851982e 100644
--- a/media/renderers/renderer_impl.cc
+++ b/media/renderers/renderer_impl.cc
@@ -202,16 +202,16 @@ void RendererImpl::EnableClocklessVideoPlaybackForTesting() {
clockless_video_playback_enabled_for_testing_ = true;
}
-base::TimeDelta RendererImpl::GetMediaTimeForSyncingVideo() {
+base::TimeTicks RendererImpl::GetWallClockTime(base::TimeDelta time) {
// 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::TimeDelta::Max();
+ return base::TimeTicks::Now();
- return time_source_->CurrentMediaTimeForSyncingVideo();
+ return time_source_->GetWallClockTime(time);
}
void RendererImpl::SetDecryptorReadyCallback(
@@ -310,8 +310,7 @@ void RendererImpl::InitializeVideoRenderer() {
base::ResetAndReturn(&paint_cb_),
base::Bind(&RendererImpl::OnVideoRendererEnded, weak_this_),
base::Bind(&RendererImpl::OnError, weak_this_),
- base::Bind(&RendererImpl::GetMediaTimeForSyncingVideo,
- base::Unretained(this)),
+ base::Bind(&RendererImpl::GetWallClockTime, 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