Chromium Code Reviews| 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 8abb8915f51b5a3103969dc4a6d715c61546491d..e7e26c2c84b0986f6bc3837e006589973114cdab 100644 |
| --- a/media/filters/pipeline_integration_test_base.cc |
| +++ b/media/filters/pipeline_integration_test_base.cc |
| @@ -10,6 +10,7 @@ |
| #include "media/base/media_log.h" |
| #include "media/filters/audio_renderer_impl.h" |
| #include "media/filters/chunk_demuxer.h" |
| +#include "media/filters/clockless_video_frame_scheduler.h" |
| #include "media/filters/ffmpeg_audio_decoder.h" |
| #include "media/filters/ffmpeg_demuxer.h" |
| #include "media/filters/ffmpeg_video_decoder.h" |
| @@ -243,16 +244,15 @@ PipelineIntegrationTestBase::CreateFilterCollection( |
| video_decoders.push_back( |
| new FFmpegVideoDecoder(message_loop_.message_loop_proxy())); |
| - // Disable frame dropping if hashing is enabled. |
| scoped_ptr<VideoRenderer> renderer(new VideoRendererImpl( |
| message_loop_.message_loop_proxy(), |
| + scoped_ptr<VideoFrameScheduler>(new ClocklessVideoFrameScheduler( |
|
acolwell GONE FROM CHROMIUM
2014/04/24 16:43:59
nit: Shouldn't we only be using this scheduler if
scherkus (not reviewing)
2014/04/25 02:04:47
Ah right ... I guess it depends whether we feel th
|
| + base::Bind(&PipelineIntegrationTestBase::OnVideoRendererPaint, |
| + base::Unretained(this)))), |
| video_decoders.Pass(), |
| base::Bind(&PipelineIntegrationTestBase::SetDecryptor, |
| base::Unretained(this), |
| - decryptor), |
| - base::Bind(&PipelineIntegrationTestBase::OnVideoRendererPaint, |
| - base::Unretained(this)), |
| - false)); |
| + decryptor))); |
| collection->SetVideoRenderer(renderer.Pass()); |
| if (!clockless_playback_) { |