[Chromecast] Upgrade to new CMA backend API

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/media/cma/filters/cma_renderer.h"
+#include "chromecast/renderer/media/cma_renderer.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/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/filters/demuxer_stream_adapter.h"
-#include "chromecast/media/cma/filters/hole_frame_factory.h"
-#include "chromecast/media/cma/pipeline/audio_pipeline.h"
 #include "chromecast/media/cma/pipeline/av_pipeline_client.h"
-#include "chromecast/media/cma/pipeline/media_pipeline.h"
 #include "chromecast/media/cma/pipeline/media_pipeline_client.h"
-#include "chromecast/media/cma/pipeline/video_pipeline.h"
 #include "chromecast/media/cma/pipeline/video_pipeline_client.h"
+#include "chromecast/renderer/media/audio_pipeline_proxy.h"
+#include "chromecast/renderer/media/demuxer_stream_adapter.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/time_delta_interpolator.h"
 #include "media/base/video_renderer_sink.h"
 #include "media/renderers/gpu_video_accelerator_factories.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));
+const base::TimeDelta kMaxDeltaFetcher(base::TimeDelta::FromMilliseconds(2000));
 
-void MediaPipelineClientDummyCallback() {}
+void MediaPipelineClientDummyCallback() {
+}
 
 }  // namespace
 
 CmaRenderer::CmaRenderer(
-    scoped_ptr<MediaPipeline> media_pipeline,
+    scoped_ptr<MediaPipelineProxy> media_pipeline,
     ::media::VideoRendererSink* video_renderer_sink,
     const scoped_refptr<::media::GpuVideoAcceleratorFactories>& gpu_factories)
     : media_task_runner_factory_(
           new BalancedMediaTaskRunnerFactory(kMaxDeltaFetcher)),
       media_pipeline_(media_pipeline.Pass()),
       audio_pipeline_(media_pipeline_->GetAudioPipeline()),
       video_pipeline_(media_pipeline_->GetVideoPipeline()),
       video_renderer_sink_(video_renderer_sink),
       state_(kUninitialized),
       is_pending_transition_(false),
@@ skipping 59 matching lines @@
   waiting_for_decryption_key_cb_ = waiting_for_decryption_key_cb;
 
   MediaPipelineClient media_pipeline_client;
   media_pipeline_client.error_cb = error_cb_;
   media_pipeline_client.buffering_state_cb = ::media::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnBufferingNotification, weak_this_));
   media_pipeline_client.time_update_cb = ::media::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnPlaybackTimeUpdated, weak_this_));
   media_pipeline_client.pipeline_backend_created_cb =
       base::Bind(&MediaPipelineClientDummyCallback);
-  media_pipeline_client.pipeline_backend_destroyed_cb
-      = base::Bind(&MediaPipelineClientDummyCallback);
+  media_pipeline_client.pipeline_backend_destroyed_cb =
+      base::Bind(&MediaPipelineClientDummyCallback);
   media_pipeline_->SetClient(media_pipeline_client);
 
   init_cb_ = init_cb;
   InitializeAudioPipeline();
 }
 
 void CmaRenderer::Flush(const base::Closure& flush_cb) {
   CMALOG(kLogControl) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
   BeginStateTransition();
 
   DCHECK(flush_cb_.is_null());
   flush_cb_ = flush_cb;
 
   if (state_ == kError) {
     OnError(::media::PIPELINE_ERROR_ABORT);
     return;
   }
 
   DCHECK_EQ(state_, kPlaying) << state_;
-  media_pipeline_->Flush(
-      ::media::BindToCurrentLoop(
-          base::Bind(&CmaRenderer::OnFlushDone, weak_this_)));
+  media_pipeline_->Flush(::media::BindToCurrentLoop(
+      base::Bind(&CmaRenderer::OnFlushDone, weak_this_)));
 
   {
     base::AutoLock auto_lock(time_interpolator_lock_);
     time_interpolator_->StopInterpolating();
   }
 }
 
 void CmaRenderer::StartPlayingFrom(base::TimeDelta time) {
   CMALOG(kLogControl) << __FUNCTION__ << ": " << time.InMilliseconds();
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 81 matching lines @@
 
 void CmaRenderer::InitializeAudioPipeline() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(state_, kUninitialized) << state_;
   DCHECK(!init_cb_.is_null());
 
   ::media::DemuxerStream* stream =
       demuxer_stream_provider_->GetStream(::media::DemuxerStream::AUDIO);
   ::media::PipelineStatusCB audio_initialization_done_cb =
       ::media::BindToCurrentLoop(
-          base::Bind(&CmaRenderer::OnAudioPipelineInitializeDone, weak_this_,
+          base::Bind(&CmaRenderer::OnAudioPipelineInitializeDone,
+                     weak_this_,
                      stream != nullptr));
   if (!stream) {
     CMALOG(kLogControl) << __FUNCTION__ << ": no audio stream, skipping init.";
     audio_initialization_done_cb.Run(::media::PIPELINE_OK);
     return;
   }
 
   // Receive events from the audio pipeline.
   AvPipelineClient av_pipeline_client;
   av_pipeline_client.eos_cb = ::media::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnEosReached, weak_this_, true));
-  av_pipeline_client.playback_error_cb = ::media::BindToCurrentLoop(
-      base::Bind(&CmaRenderer::OnError, weak_this_));
+  av_pipeline_client.playback_error_cb =
+      ::media::BindToCurrentLoop(base::Bind(&CmaRenderer::OnError, weak_this_));
   av_pipeline_client.statistics_cb = ::media::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnStatisticsUpdated, weak_this_));
   audio_pipeline_->SetClient(av_pipeline_client);
 
   scoped_ptr<CodedFrameProvider> frame_provider(new DemuxerStreamAdapter(
       base::ThreadTaskRunnerHandle::Get(), media_task_runner_factory_, stream));
 
   const ::media::AudioDecoderConfig& config = stream->audio_decoder_config();
   if (config.codec() == ::media::kCodecAAC)
     stream->EnableBitstreamConverter();
@@ skipping 25 matching lines @@
 
 void CmaRenderer::InitializeVideoPipeline() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(state_, kUninitialized) << state_;
   DCHECK(!init_cb_.is_null());
 
   ::media::DemuxerStream* stream =
       demuxer_stream_provider_->GetStream(::media::DemuxerStream::VIDEO);
   ::media::PipelineStatusCB video_initialization_done_cb =
       ::media::BindToCurrentLoop(
-          base::Bind(&CmaRenderer::OnVideoPipelineInitializeDone, weak_this_,
+          base::Bind(&CmaRenderer::OnVideoPipelineInitializeDone,
+                     weak_this_,
                      stream != nullptr));
   if (!stream) {
     CMALOG(kLogControl) << __FUNCTION__ << ": no video stream, skipping init.";
     video_initialization_done_cb.Run(::media::PIPELINE_OK);
     return;
   }
 
   // Receive events from the video pipeline.
   VideoPipelineClient client;
   client.av_pipeline_client.eos_cb = ::media::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnEosReached, weak_this_, false));
-  client.av_pipeline_client.playback_error_cb = ::media::BindToCurrentLoop(
-      base::Bind(&CmaRenderer::OnError, weak_this_));
+  client.av_pipeline_client.playback_error_cb =
+      ::media::BindToCurrentLoop(base::Bind(&CmaRenderer::OnError, weak_this_));
   client.av_pipeline_client.statistics_cb = ::media::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnStatisticsUpdated, weak_this_));
   client.natural_size_changed_cb = ::media::BindToCurrentLoop(
       base::Bind(&CmaRenderer::OnNaturalSizeChanged, weak_this_));
   video_pipeline_->SetClient(client);
 
   scoped_ptr<CodedFrameProvider> frame_provider(new DemuxerStreamAdapter(
       base::ThreadTaskRunnerHandle::Get(), media_task_runner_factory_, stream));
 
   const ::media::VideoDecoderConfig& config = stream->video_decoder_config();
   if (config.codec() == ::media::kCodecH264)
     stream->EnableBitstreamConverter();
 
   initial_natural_size_ = config.natural_size();
 
   std::vector<::media::VideoDecoderConfig> configs;
   configs.push_back(config);
   media_pipeline_->InitializeVideo(
-      configs,
-      frame_provider.Pass(),
-      video_initialization_done_cb);
+      configs, frame_provider.Pass(), video_initialization_done_cb);
 }
 
 void CmaRenderer::OnVideoPipelineInitializeDone(
     bool video_stream_present,
     ::media::PipelineStatus status) {
   CMALOG(kLogControl) << __FUNCTION__ << ": state=" << state_;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // OnError() may be fired at any time, even before initialization is complete.
   if (state_ == kError)
@@ skipping 21 matching lines @@
   if (is_audio) {
     DCHECK(!received_audio_eos_);
     received_audio_eos_ = true;
   } else {
     DCHECK(!received_video_eos_);
     received_video_eos_ = true;
   }
 
   bool audio_finished = !has_audio_ || received_audio_eos_;
   bool video_finished = !has_video_ || received_video_eos_;
-  CMALOG(kLogControl) << __FUNCTION__
-                      << " audio_finished=" << audio_finished
+  CMALOG(kLogControl) << __FUNCTION__ << " audio_finished=" << audio_finished
                       << " video_finished=" << video_finished;
   if (audio_finished && video_finished)
     ended_cb_.Run();
 }
 
 void CmaRenderer::OnStatisticsUpdated(
     const ::media::PipelineStatistics& stats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   statistics_cb_.Run(stats);
 }
 
 void CmaRenderer::OnNaturalSizeChanged(const gfx::Size& size) {
   DCHECK(thread_checker_.CalledOnValidThread());
   video_renderer_sink_->PaintFrameUsingOldRenderingPath(
       hole_frame_factory_->CreateHoleFrame(size));
 }
 
-void CmaRenderer::OnPlaybackTimeUpdated(
-    base::TimeDelta time,
-    base::TimeDelta max_time,
-    base::TimeTicks capture_time) {
+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;
   }
 
   // TODO(halliwell): arguably, TimeDeltaInterpolator::SetBounds should perform
   // this calculation to avoid calling TimeTicks::Now twice (it's slower and has
   // potential accuracy problems).
   base::TimeDelta lower_bound =
@@ skipping 58 matching lines @@
   is_pending_transition_ = true;
 }
 
 void CmaRenderer::CompleteStateTransition(State new_state) {
   state_ = new_state;
   is_pending_transition_ = false;
 }
 
 }  // namespace media
 }  // namespace chromecast