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

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

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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/mojo_renderer_service.h ('k') | media/mojo/services/renderer_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_service.cc
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc
index 0601c2c461e90364a55eec1a003aa974b5b74e95..7b6884d93b753b2c0e03a156031f1ab574ec6505 100644
--- a/media/mojo/services/mojo_renderer_service.cc
+++ b/media/mojo/services/mojo_renderer_service.cc
@@ -14,7 +14,6 @@
#include "media/base/decryptor.h"
#include "media/base/media_log.h"
#include "media/base/video_renderer.h"
-#include "media/base/video_renderer_sink.h"
#include "media/mojo/services/demuxer_stream_provider_shim.h"
#include "media/mojo/services/renderer_config.h"
#include "media/renderers/audio_renderer_impl.h"
@@ -26,6 +25,9 @@ namespace media {
// Time interval to update media time.
const int kTimeUpdateIntervalMs = 50;
+static void PaintNothing(const scoped_refptr<VideoFrame>& frame) {
+}
+
MojoRendererService::MojoRendererService()
: state_(STATE_UNINITIALIZED),
last_media_time_usec_(0),
@@ -38,7 +40,6 @@ MojoRendererService::MojoRendererService()
scoped_refptr<MediaLog> media_log(new MediaLog());
RendererConfig* renderer_config = RendererConfig::Get();
audio_renderer_sink_ = renderer_config->GetAudioRendererSink();
- video_renderer_sink_ = renderer_config->GetVideoRendererSink();
scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
task_runner, audio_renderer_sink_.get(),
@@ -48,7 +49,7 @@ MojoRendererService::MojoRendererService()
renderer_config->GetAudioHardwareConfig(), media_log));
scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
- task_runner, video_renderer_sink_.get(),
+ task_runner,
renderer_config->GetVideoDecoders(task_runner,
base::Bind(&MediaLog::AddLogEvent,
media_log)).Pass(),
@@ -112,6 +113,7 @@ void MojoRendererService::OnStreamReady(const mojo::Closure& callback) {
&MojoRendererService::OnRendererInitializeDone, weak_this_, callback),
base::Bind(&MojoRendererService::OnUpdateStatistics, weak_this_),
base::Bind(&MojoRendererService::OnBufferingStateChanged, weak_this_),
+ base::Bind(&PaintNothing),
base::Bind(&MojoRendererService::OnRendererEnded, weak_this_),
base::Bind(&MojoRendererService::OnError, weak_this_),
base::Bind(base::DoNothing));
« no previous file with comments | « media/mojo/services/mojo_renderer_service.h ('k') | media/mojo/services/renderer_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698