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/renderer_client.h"
+#include "media/base/video_renderer_sink.h"
 #include "media/mojo/services/mojo_demuxer_stream_impl.h"
+#include "media/renderers/video_overlay_factory.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 
 namespace media {
 
 MojoRendererImpl::MojoRendererImpl(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
+    std::unique_ptr<VideoOverlayFactory> video_overlay_factory,
+    VideoRendererSink* video_renderer_sink,
     mojom::RendererPtr remote_renderer)
     : task_runner_(task_runner),
+      video_overlay_factory_(std::move(video_overlay_factory)),
+      video_renderer_sink_(video_renderer_sink),
       remote_renderer_info_(remote_renderer.PassInterface()),
       binding_(this) {
   DVLOG(1) << __FUNCTION__;
 }
 
 MojoRendererImpl::~MojoRendererImpl() {
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 }
 
@@ skipping 139 matching lines @@
   DVLOG(1) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(init_cb_.is_null());
 
   // TODO(tim): Should we plumb error code from remote renderer?
   // http://crbug.com/410451.
   client_->OnError(PIPELINE_ERROR_DECODE);
 }
 
 void MojoRendererImpl::OnVideoNaturalSizeChange(mojo::SizePtr size) {
-  DVLOG(2) << __FUNCTION__ << ": " << size->width << "," << size->height;
+  gfx::Size new_size = size.To<gfx::Size>();
+  DVLOG(2) << __FUNCTION__ << ": " << new_size.ToString();
   DCHECK(task_runner_->BelongsToCurrentThread());
-  client_->OnVideoNaturalSizeChange(size.To<gfx::Size>());
+
+  video_renderer_sink_->PaintFrameUsingOldRenderingPath(
+      video_overlay_factory_->CreateFrame(new_size));
+  client_->OnVideoNaturalSizeChange(new_size);
 }
 
 void MojoRendererImpl::OnVideoOpacityChange(bool opaque) {
   DVLOG(2) << __FUNCTION__ << ": " << opaque;
   DCHECK(task_runner_->BelongsToCurrentThread());
   client_->OnVideoOpacityChange(opaque);
 }
 
 void MojoRendererImpl::OnConnectionError() {
   DVLOG(1) << __FUNCTION__;
@@ skipping 10 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