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

Unified Diff: media/filters/pipeline_integration_test_base.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/renderer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 3a3c91fa8d8de78e5f08bed4dcf9c9d16f344ad2..8edab1887a31e04f37bb46c0499906778664154c 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/memory/scoped_vector.h"
#include "media/base/media_log.h"
+#include "media/base/time_delta_interpolator.h"
#include "media/filters/audio_renderer_impl.h"
#include "media/filters/chunk_demuxer.h"
#include "media/filters/ffmpeg_audio_decoder.h"
@@ -301,8 +302,10 @@
// machine, valgrind).
renderer_impl->DisableUnderflowForTesting();
- if (clockless_playback_)
- renderer_impl->EnableClocklessVideoPlaybackForTesting();
+ if (clockless_playback_) {
+ renderer_impl->SetTimeDeltaInterpolatorForTesting(
+ new TimeDeltaInterpolator(&dummy_clock_));
+ }
return renderer_impl.PassAs<Renderer>();
}
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698