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

Unified Diff: media/mojo/services/renderer_config_default.cc

Issue 1188753002: media: Fix mojo pipeline integration tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: MEDIA_EXPORT Created 5 years, 6 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/mojo/services/renderer_config.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..6a32d2ad2c451667d142b502bf2a1e7188c0afa0 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::FromSecondsD(1.0 / 60),
+ NullVideoSink::NewFrameCB(), task_runner));
}
const AudioHardwareConfig& GetAudioHardwareConfig() override {
« no previous file with comments | « media/mojo/services/renderer_config.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698