Chromium Code Reviews| Index: media/mojo/services/renderer_config_default.cc |
| diff --git a/media/mojo/services/renderer_config_default.cc b/media/mojo/services/renderer_config_default.cc |
| index 3b520ef3f3d0d9c951ac3833ae6ebbf978cf0436..5b9448cd2bdfc36d45f66df9f28aa70a2a2e3302 100644 |
| --- a/media/mojo/services/renderer_config_default.cc |
| +++ b/media/mojo/services/renderer_config_default.cc |
| @@ -10,6 +10,7 @@ |
| #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) |
| @@ -24,20 +25,6 @@ |
| 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() { |
| @@ -96,8 +83,11 @@ class DefaultRendererConfig : public PlatformRendererConfig { |
| 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 { |