media: Fix mojo pipeline integration tests.

media/mojo/services/renderer_config_default.cc

 // Copyright 2014 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/mojo/services/renderer_config.h"
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_output_stream_sink.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/base/media.h"
+#include "media/base/null_video_sink.h"
 #include "media/filters/opus_audio_decoder.h"
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #endif
 
 #if !defined(MEDIA_DISABLE_LIBVPX)
 #include "media/filters/vpx_video_decoder.h"
 #endif
 
 namespace media {
 namespace internal {
 
-class DummyVideoRendererSink : public VideoRendererSink {
- public:
-  DummyVideoRendererSink() {}
-  ~DummyVideoRendererSink() override {}
-
-  void Start(RenderCallback* callback) override {}
-  void Stop() override {}
-  void PaintFrameUsingOldRenderingPath(
-      const scoped_refptr<VideoFrame>& frame) override {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DummyVideoRendererSink);
-};
-
 class DefaultRendererConfig : public PlatformRendererConfig {
  public:
   DefaultRendererConfig() {
     InitializeMediaLibrary();
 
     // TODO(dalecurtis): We should find a single owner per process for the audio
     // manager or make it a lazy instance.  It's not safe to call Get()/Create()
     // across multiple threads...
     //
     // TODO(dalecurtis): Eventually we'll want something other than a fake audio
@@ skipping 38 matching lines @@
     video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner));
 #endif
 
     return video_decoders.Pass();
   }
 
   scoped_refptr<AudioRendererSink> GetAudioRendererSink() override {
     return new AudioOutputStreamSink();
   }
 
-  scoped_ptr<VideoRendererSink> GetVideoRendererSink() override {
-    return make_scoped_ptr(new DummyVideoRendererSink());
+  scoped_ptr<VideoRendererSink> GetVideoRendererSink(
+      const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) override {
+    return make_scoped_ptr(
+        new NullVideoSink(false, base::TimeDelta::FromMilliseconds(30),

[DaleCurtis, 2015/06/16 16:24:44]

FromSecondsD(1.0 / 60) is what I used elsewhere.

[xhwang, 2015/06/16 17:16:57]

Done.

+                          NullVideoSink::NewFrameCB(), task_runner));
   }
 
   const AudioHardwareConfig& GetAudioHardwareConfig() override {
     return *audio_hardware_config_;
   }
 
  private:
   FakeAudioLogFactory fake_audio_log_factory_;
   scoped_ptr<AudioHardwareConfig> audio_hardware_config_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultRendererConfig);
 };
 
 scoped_ptr<PlatformRendererConfig> CreatePlatformRendererConfig() {
   return make_scoped_ptr(new DefaultRendererConfig());
 }
 
 }  // namespace internal
 }  // namespace media