Add video-rendering to mojo media pipeline.

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 <utility>
 
 #include "base/bind.h"
 #include "media/base/media_keys.h"
 #include "media/base/renderer.h"
 #include "media/mojo/services/demuxer_stream_provider_shim.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
+#include "mojo/converters/geometry/geometry_type_converters.h"
 
 namespace media {
 
 // Time interval to update media time.
 const int kTimeUpdateIntervalMs = 50;
 
 MojoRendererService::MojoRendererService(
     base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
     std::unique_ptr<media::Renderer> renderer,
     mojo::InterfaceRequest<interfaces::Renderer> request)
@@ skipping 78 matching lines @@
   renderer_->SetCdm(cdm_context, base::Bind(&MojoRendererService::OnCdmAttached,
                                             weak_this_, cdm, callback));
 }
 
 void MojoRendererService::OnStreamReady(
     const mojo::Callback<void(bool)>& callback) {
   DCHECK_EQ(state_, STATE_INITIALIZING);
 
   renderer_->Initialize(
       stream_provider_.get(),
-      base::Bind(
-          &MojoRendererService::OnRendererInitializeDone, weak_this_, callback),
+      base::Bind(&MojoRendererService::OnRendererInitializeDone, weak_this_,
+                 callback),
       base::Bind(&MojoRendererService::OnUpdateStatistics, weak_this_),
       base::Bind(&MojoRendererService::OnBufferingStateChanged, weak_this_),
+      base::Bind(&MojoRendererService::OnNaturalSizeChanged, weak_this_),
       base::Bind(&MojoRendererService::OnRendererEnded, weak_this_),
       base::Bind(&MojoRendererService::OnError, weak_this_),
       base::Bind(base::DoNothing));
 }
 
 void MojoRendererService::OnRendererInitializeDone(
     const mojo::Callback<void(bool)>& callback,
     PipelineStatus status) {
   DVLOG(1) << __FUNCTION__;
   DCHECK_EQ(state_, STATE_INITIALIZING);
@@ skipping 35 matching lines @@
       base::Bind(&MojoRendererService::UpdateMediaTime, weak_this_, false));
 }
 
 void MojoRendererService::OnBufferingStateChanged(
     BufferingState new_buffering_state) {
   DVLOG(2) << __FUNCTION__ << "(" << new_buffering_state << ")";
   client_->OnBufferingStateChange(
       static_cast<interfaces::BufferingState>(new_buffering_state));
 }
 
+void MojoRendererService::OnNaturalSizeChanged(const gfx::Size& size) {
+  DVLOG(2) << __FUNCTION__ << "(" << size.ToString() << ")";
+  client_->OnNaturalSizeChanged(mojo::Size::From(size));
+}
+
 void MojoRendererService::OnRendererEnded() {
   DVLOG(1) << __FUNCTION__;
   CancelPeriodicMediaTimeUpdates();
   client_->OnEnded();
 }
 
 void MojoRendererService::OnError(PipelineStatus error) {
   DVLOG(1) << __FUNCTION__ << "(" << error << ")";
   state_ = STATE_ERROR;
   client_->OnError();
@@ skipping 12 matching lines @@
     bool success) {
   DVLOG(1) << __FUNCTION__ << "(" << success << ")";
 
   if (success)
     cdm_ = cdm;
 
   callback.Run(success);
 }
 
 }  // namespace media