Add support for external video renderers in mojo.

media/mojo/services/mojo_renderer_service.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/mojo_renderer_service.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/memory/scoped_vector.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_log.h"
 #include "media/base/video_renderer.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/renderer_impl.h"
+#include "media/filters/video_renderer_impl.h"
+#include "media/mojo/services/demuxer_stream_provider_shim.h"
 #include "media/mojo/services/mojo_demuxer_stream_adapter.h"
 #include "media/mojo/services/renderer_config.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 
 namespace media {
 
 // Time interval to update media time.
 const int kTimeUpdateIntervalMs = 50;
 
 static void LogMediaSourceError(const scoped_refptr<MediaLog>& media_log,
                                 const std::string& error) {
   media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error));
 }
 
-// Shim DemuxerStreamProvider wrapper for a single DemuxerStream.
-// TODO(dalecurtis): Once we support more than one DemuxerStream we'll need a
-// more complicated shim which can handle a mojo::Array<DemuxerStream>.
-class DemuxerStreamProviderShim : public DemuxerStreamProvider {
- public:
-  DemuxerStreamProviderShim(scoped_ptr<MojoDemuxerStreamAdapter> stream)
-      : stream_(stream.Pass()) {}
-
-  ~DemuxerStreamProviderShim() override {}
-
-  DemuxerStream* GetStream(DemuxerStream::Type type) override {
-    return type != stream_->type() ? nullptr : stream_.get();
-  };
-
-  Liveness GetLiveness() const override {
-    return DemuxerStreamProvider::LIVENESS_UNKNOWN;
-  }
-
- private:
-  scoped_ptr<MojoDemuxerStreamAdapter> stream_;
-
-  DISALLOW_COPY_AND_ASSIGN(DemuxerStreamProviderShim);
-};
+static void PaintNothing(const scoped_refptr<VideoFrame>& frame) {
+}
 
 class MojoRendererApplication
     : public mojo::ApplicationDelegate,
       public mojo::InterfaceFactory<mojo::MediaRenderer> {
  public:
   // mojo::ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService(this);
     return true;
@@ skipping 26 matching lines @@
 
   scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
       task_runner,
       audio_renderer_sink_.get(),
       renderer_config->GetAudioDecoders(
                            task_runner,
                            base::Bind(&LogMediaSourceError, media_log)).Pass(),
       SetDecryptorReadyCB(),
       renderer_config->GetAudioHardwareConfig(),
       media_log));
-  scoped_ptr<VideoRenderer> video_renderer(nullptr);
+
+  scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
+      task_runner,
+      renderer_config->GetVideoDecoders(
+                           task_runner,
+                           base::Bind(&LogMediaSourceError, media_log)).Pass(),
+      SetDecryptorReadyCB(),
+      base::Bind(&PaintNothing),
+      true,
+      media_log));
 
   // Create renderer.
   renderer_.reset(new RendererImpl(
       task_runner, audio_renderer.Pass(), video_renderer.Pass()));
 }
 
 MojoRendererService::~MojoRendererService() {
 }
 
-void MojoRendererService::Initialize(mojo::DemuxerStreamPtr stream,
+void MojoRendererService::Initialize(mojo::DemuxerStreamPtr audio,
+                                     mojo::DemuxerStreamPtr video,
                                      const mojo::Closure& callback) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
   DCHECK(client());
 
   state_ = STATE_INITIALIZING;
   stream_provider_.reset(new DemuxerStreamProviderShim(
-      make_scoped_ptr(new MojoDemuxerStreamAdapter(
-                          stream.Pass(),
-                          base::Bind(&MojoRendererService::OnStreamReady,
-                                     weak_this_,
-                                     callback))).Pass()));
+      audio.Pass(),
+      video.Pass(),
+      base::Bind(&MojoRendererService::OnStreamReady, weak_this_, callback)));
 }
 
 void MojoRendererService::Flush(const mojo::Closure& callback) {
   DVLOG(2) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_PLAYING);
 
   state_ = STATE_FLUSHING;
   time_update_timer_.Reset();
   renderer_->Flush(base::Bind(&MojoTrampoline, callback));
 }
@@ skipping 80 matching lines @@
   state_ = STATE_ERROR;
   client()->OnError();
 }
 
 }  // namespace media
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new media::MojoRendererApplication);
   return runner.Run(shell_handle);
 }