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

Unified Diff: media/renderers/renderer_impl.cc

Issue 1207423003: Roll FFmpeg for M45. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/filters/ffmpeg_demuxer_unittest.cc ('k') | no next file » | 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 8efe432a7ccd64f8fb5dc982ff2a17b415fbe05d..63c4a5f7a1f9c059bd058fc187c6ef57e3508001 100644
--- a/media/renderers/renderer_impl.cc
+++ b/media/renderers/renderer_impl.cc
@@ -238,8 +238,15 @@ bool RendererImpl::GetWallClockTimes(
// 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_) {
- *wall_clock_times = std::vector<base::TimeTicks>(media_timestamps.size(),
- base::TimeTicks::Now());
+ if (media_timestamps.empty()) {
+ *wall_clock_times = std::vector<base::TimeTicks>(1,
DaleCurtis 2015/07/01 21:42:29 wall clock times should be empty, so add a DCHECK(
+ base::TimeTicks::Now());
+ } else {
+ *wall_clock_times = std::vector<base::TimeTicks>();
+ for (auto const &media_time : media_timestamps) {
+ wall_clock_times->push_back(base::TimeTicks() + media_time);
+ }
+ }
return true;
}
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698