Add video-rendering to mojo media pipeline.

media/mojo/services/mojo_renderer_impl.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_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "media/base/demuxer_stream_provider.h"
+#include "media/base/video_decoder_config.h"
+#include "media/base/video_renderer_sink.h"
 #include "media/mojo/services/mojo_demuxer_stream_impl.h"
+#include "media/mojo/services/video_overlay_factory.h"
+#include "mojo/converters/geometry/geometry_type_converters.h"
 
 namespace media {
 
 MojoRendererImpl::MojoRendererImpl(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
+    VideoRendererSink* video_renderer_sink,
+    GpuVideoAcceleratorFactories* gpu_factories,
     interfaces::RendererPtr remote_renderer)
     : task_runner_(task_runner),
+      video_renderer_sink_(video_renderer_sink),
+      gpu_factories_(gpu_factories),
       remote_renderer_info_(remote_renderer.PassInterface()),
       binding_(this) {
   DVLOG(1) << __FUNCTION__;
 }
 
 MojoRendererImpl::~MojoRendererImpl() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 }
 
 // TODO(xhwang): Support |waiting_for_decryption_key_cb| and |statictics_cb|.
 // See http://crbug.com/585287
 void MojoRendererImpl::Initialize(
     DemuxerStreamProvider* demuxer_stream_provider,
     const PipelineStatusCB& init_cb,
     const StatisticsCB& /* statistics_cb */,
     const BufferingStateCB& buffering_state_cb,
+    const NaturalSizeChangedCB& natural_size_changed_cb,
     const base::Closure& ended_cb,
     const PipelineStatusCB& error_cb,
     const base::Closure& /* waiting_for_decryption_key_cb */) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(demuxer_stream_provider);
 
   // Bind |remote_renderer_| to the |task_runner_|.
   remote_renderer_.Bind(std::move(remote_renderer_info_));
 
   // If connection error has happened, fail immediately.
   if (remote_renderer_.encountered_error()) {
     task_runner_->PostTask(
         FROM_HERE, base::Bind(init_cb, PIPELINE_ERROR_INITIALIZATION_FAILED));
     return;
   }
 
   // Otherwise, set an error handler to catch the connection error.
   // Using base::Unretained(this) is safe because |this| owns
   // |remote_renderer_|, and the error handler can't be invoked once
   // |remote_renderer_| is destroyed.
   remote_renderer_.set_connection_error_handler(
       base::Bind(&MojoRendererImpl::OnConnectionError, base::Unretained(this)));
 
   demuxer_stream_provider_ = demuxer_stream_provider;
   init_cb_ = init_cb;
   buffering_state_cb_ = buffering_state_cb;
+  natural_size_changed_cb_ = natural_size_changed_cb;
   ended_cb_ = ended_cb;
   error_cb_ = error_cb;
 
   // Create audio and video interfaces::DemuxerStream and bind its lifetime to
   // the pipe.
   DemuxerStream* const audio =
       demuxer_stream_provider_->GetStream(DemuxerStream::AUDIO);
   DemuxerStream* const video =
       demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO);
 
   interfaces::DemuxerStreamPtr audio_stream;
   if (audio)
     new MojoDemuxerStreamImpl(audio, GetProxy(&audio_stream));
 
   interfaces::DemuxerStreamPtr video_stream;
-  if (video)
+  if (video) {
     new MojoDemuxerStreamImpl(video, GetProxy(&video_stream));
+    video_overlay_factory_.reset(new VideoOverlayFactory(gpu_factories_));
+  }
 
   // Using base::Unretained(this) is safe because |this| owns
   // |remote_renderer_|, and the callback won't be dispatched if
   // |remote_renderer_| is destroyed.
   remote_renderer_->Initialize(
       binding_.CreateInterfacePtrAndBind(), std::move(audio_stream),
       std::move(video_stream),
       base::Bind(&MojoRendererImpl::OnInitialized, base::Unretained(this)));
 }
 
@@ skipping 16 matching lines @@
 void MojoRendererImpl::Flush(const base::Closure& flush_cb) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   remote_renderer_->Flush(flush_cb);
 }
 
 void MojoRendererImpl::StartPlayingFrom(base::TimeDelta time) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
+  if (HasVideo()) {
+    DCHECK(video_overlay_factory_);
+    DCHECK(video_renderer_sink_);
+    DemuxerStream* video_stream =
+        demuxer_stream_provider_->GetStream(DemuxerStream::VIDEO);
+    video_renderer_sink_->PaintFrameUsingOldRenderingPath(

[xhwang, 2016/04/12 19:40:37]

We have a comment that PaintFrameUsingOldRenderingPath() will go away. But this
seems a legit use case. Maybe we should make this path official.

+dalecurtis: WDYT? Did you have any plan to support overlay using the new
RenderCallback path?

+        video_overlay_factory_->CreateFrame(
+            video_stream->video_decoder_config().natural_size()));
+  }
+
   {
     base::AutoLock auto_lock(lock_);
     time_ = time;
   }
-
   remote_renderer_->StartPlayingFrom(time.InMicroseconds());
 }
 
 void MojoRendererImpl::SetPlaybackRate(double playback_rate) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   remote_renderer_->SetPlaybackRate(playback_rate);
 }
 
 void MojoRendererImpl::SetVolume(float volume) {
@@ skipping 29 matching lines @@
   time_ = base::TimeDelta::FromMicroseconds(time_usec);
 }
 
 void MojoRendererImpl::OnBufferingStateChange(
     interfaces::BufferingState state) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   buffering_state_cb_.Run(static_cast<media::BufferingState>(state));
 }
 
+void MojoRendererImpl::OnNaturalSizeChanged(mojo::SizePtr size) {
+  DVLOG(2) << __FUNCTION__;
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  natural_size_changed_cb_.Run(size.To<gfx::Size>());
+}
+
 void MojoRendererImpl::OnEnded() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   ended_cb_.Run();
 }
 
 void MojoRendererImpl::OnError() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(init_cb_.is_null());
@@ skipping 18 matching lines @@
 void MojoRendererImpl::OnInitialized(bool success) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!init_cb_.is_null());
 
   base::ResetAndReturn(&init_cb_)
       .Run(success ? PIPELINE_OK : PIPELINE_ERROR_INITIALIZATION_FAILED);
 }
 
 }  // namespace media