Add video-rendering to mojo media pipeline.

chromecast/renderer/media/cma_renderer.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 "chromecast/renderer/media/cma_renderer.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h"
 #include "chromecast/media/cma/base/cma_logging.h"
 #include "chromecast/media/cma/base/demuxer_stream_adapter.h"
 #include "chromecast/media/cma/pipeline/av_pipeline_client.h"
 #include "chromecast/media/cma/pipeline/media_pipeline_client.h"
 #include "chromecast/media/cma/pipeline/video_pipeline_client.h"
 #include "chromecast/renderer/media/audio_pipeline_proxy.h"
-#include "chromecast/renderer/media/hole_frame_factory.h"
 #include "chromecast/renderer/media/media_pipeline_proxy.h"
 #include "chromecast/renderer/media/video_pipeline_proxy.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/demuxer_stream_provider.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/renderer_client.h"
 #include "media/base/time_delta_interpolator.h"
 #include "media/base/video_renderer_sink.h"
-#include "media/renderers/gpu_video_accelerator_factories.h"
+#include "media/renderers/video_overlay_factory.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace chromecast {
 namespace media {
 
 namespace {
 
 // Maximum difference between audio frame PTS and video frame PTS
 // for frames read from the DemuxerStream.
 const base::TimeDelta kMaxDeltaFetcher(base::TimeDelta::FromMilliseconds(2000));
@@ skipping 45 matching lines @@
     ::media::RendererClient* client,
     const ::media::PipelineStatusCB& init_cb) {
   CMALOG(kLogControl) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(state_, kUninitialized) << state_;
   DCHECK(!init_cb.is_null());
   DCHECK(demuxer_stream_provider->GetStream(::media::DemuxerStream::AUDIO) ||
          demuxer_stream_provider->GetStream(::media::DemuxerStream::VIDEO));
 
   // Deferred from ctor so as to initialise on correct thread.
-  hole_frame_factory_.reset(new HoleFrameFactory(gpu_factories_));
+  video_overlay_factory_.reset(
+      new ::media::VideoOverlayFactory(gpu_factories_));
 
   BeginStateTransition();
 
   demuxer_stream_provider_ = demuxer_stream_provider;
   client_ = client;
 
   MediaPipelineClient media_pipeline_client;
   media_pipeline_client.error_cb =
       ::media::BindToCurrentLoop(base::Bind(&CmaRenderer::OnError, weak_this_));
   media_pipeline_client.buffering_state_cb = ::media::BindToCurrentLoop(
@@ skipping 263 matching lines @@
 
 void CmaRenderer::OnStatisticsUpdated(
     const ::media::PipelineStatistics& stats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   client_->OnStatisticsUpdate(stats);
 }
 
 void CmaRenderer::OnNaturalSizeChanged(const gfx::Size& size) {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_renderer_sink_->PaintFrameUsingOldRenderingPath(
-      hole_frame_factory_->CreateHoleFrame(size));
+      video_overlay_factory_->CreateFrame(size));
   client_->OnVideoNaturalSizeChange(size);
 }
 
 void CmaRenderer::OnPlaybackTimeUpdated(base::TimeDelta time,
                                         base::TimeDelta max_time,
                                         base::TimeTicks capture_time) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (state_ != kPlaying) {
     LOG(WARNING) << "Ignoring a late time update";
     return;
@@ skipping 57 matching lines @@
   is_pending_transition_ = true;
 }
 
 void CmaRenderer::CompleteStateTransition(State new_state) {
   state_ = new_state;
   is_pending_transition_ = false;
 }
 
 }  // namespace media
 }  // namespace chromecast