Refactor VideoRendererImpl to use VideoFrameScheduler.

media/filters/pipeline_integration_test_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "media/base/clock.h"
 #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"
 #include "media/filters/file_data_source.h"
 #include "media/filters/opus_audio_decoder.h"
 #include "media/filters/vpx_video_decoder.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::AtMost;
@@ skipping 213 matching lines @@
 
   scoped_ptr<FilterCollection> collection(new FilterCollection());
   collection->SetDemuxer(demuxer_.get());
 
   ScopedVector<VideoDecoder> video_decoders;
   video_decoders.push_back(
       new VpxVideoDecoder(message_loop_.message_loop_proxy()));
   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 clockless_playback_ is set?

[scherkus (not reviewing), 2014/04/25 02:04:47]

Ah right ... I guess it depends whether we feel these tests need to run in "real
time" versus clockless so they take less time. I'm not sure what sort of
coverage we hope we're getting by having artificially slow tests. Hmm...

I'll fix this for now but here are some numbers for consideration when running
with --single-process-tests --gtest_filter=PipelineIntegration*

no clockless: 31s
clockless video: 24s (most clips contain audio)
clockless audio+video: 8s (!!!)

+          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_) {
     audio_sink_ = new NullAudioSink(message_loop_.message_loop_proxy());
   } else {
     clockless_audio_sink_ = new ClocklessAudioSink();
   }
 
   ScopedVector<AudioDecoder> audio_decoders;
   audio_decoders.push_back(
@@ skipping 59 matching lines @@
   DCHECK(clockless_playback_);
   return clockless_audio_sink_->render_time();
 }
 
 base::TimeTicks DummyTickClock::NowTicks() {
   now_ += base::TimeDelta::FromSeconds(60);
   return now_;
 }
 
 }  // namespace media