[Chromecast] Upgrade to new CMA backend API

chromecast/browser/media/media_pipeline_host.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/browser/media/media_pipeline_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 35 matching lines @@
 MediaPipelineHost::~MediaPipelineHost() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   for (MediaTrackMap::iterator it = media_track_map_.begin();
        it != media_track_map_.end(); ++it) {
     scoped_ptr<MediaTrackHost> media_track(it->second);
   }
   media_track_map_.clear();
 }
 
-void MediaPipelineHost::Initialize(
-    LoadType load_type,
-    const MediaPipelineClient& client,
-    const CreateDeviceComponentsCB& create_device_components_cb) {
+void MediaPipelineHost::Initialize(LoadType load_type,
+                                   const BrowserMediaPipelineClient& client,
+                                   const CreateBackendCB& create_backend_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
   media_pipeline_.reset(new MediaPipelineImpl());
   task_runner_.reset(new TaskRunnerImpl());
   MediaPipelineDeviceParams::MediaSyncType sync_type =
       (load_type == kLoadTypeMediaStream)
           ? MediaPipelineDeviceParams::kModeIgnorePts
           : MediaPipelineDeviceParams::kModeSyncPts;
   MediaPipelineDeviceParams default_parameters(sync_type, task_runner_.get());
 
   media_pipeline_->SetClient(client);
-  media_pipeline_->Initialize(
-      load_type, create_device_components_cb.Run(default_parameters).Pass());
+  media_pipeline_->Initialize(load_type,
+                              create_backend_cb.Run(default_parameters).Pass());
 }
 
 void MediaPipelineHost::SetAvPipe(
     TrackId track_id,
     scoped_ptr<base::SharedMemory> shared_mem,
     const base::Closure& pipe_read_activity_cb,
     const base::Closure& av_pipe_set_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
   CHECK(track_id == kAudioTrackId || track_id == kVideoTrackId);
 
@@ skipping 12 matching lines @@
     media_track_host = new MediaTrackHost();
     media_track_map_.insert(
         std::pair<TrackId, MediaTrackHost*>(track_id, media_track_host));
   } else {
     media_track_host = it->second;
   }
   media_track_host->pipe_write_cb = frame_provider_host->GetFifoWriteEventCb();
 
   scoped_ptr<CodedFrameProvider> frame_provider(frame_provider_host.release());
   if (track_id == kAudioTrackId) {
-    media_pipeline_->GetAudioPipelineImpl()->SetCodedFrameProvider(
-        frame_provider.Pass());
+    audio_frame_provider_ = frame_provider.Pass();

[slan, 2015/10/06 19:33:59]

Remove line 101, then replace this with:

audio_frame_provider_ = frame_provider_host.Pass();

same for line 105

[kmackay, 2015/10/06 21:44:55]

Done.

   } else {
-    media_pipeline_->GetVideoPipelineImpl()->SetCodedFrameProvider(
-        frame_provider.Pass());
+    video_frame_provider_ = frame_provider.Pass();
   }
   av_pipe_set_cb.Run();
 }
 
 void MediaPipelineHost::AudioInitialize(
     TrackId track_id,
-    const AvPipelineClient& client,
+    const BrowserAvPipelineClient& client,
     const ::media::AudioDecoderConfig& config,
     const ::media::PipelineStatusCB& status_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
   CHECK(track_id == kAudioTrackId);
-  media_pipeline_->GetAudioPipeline()->SetClient(client);
   media_pipeline_->InitializeAudio(
-      config, scoped_ptr<CodedFrameProvider>(), status_cb);
+      config, client, audio_frame_provider_.Pass(), status_cb);
 }
 
 void MediaPipelineHost::VideoInitialize(
     TrackId track_id,
-    const VideoPipelineClient& client,
-    const std::vector<::media::VideoDecoderConfig>& configs,
+    const BrowserVideoPipelineClient& client,
+    const std::vector< ::media::VideoDecoderConfig>& configs,

[slan, 2015/10/06 19:33:59]

1-char nit: remove char.

[kmackay, 2015/10/06 21:44:55]

clang-format likes it with the space.

     const ::media::PipelineStatusCB& status_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
   CHECK(track_id == kVideoTrackId);
-  media_pipeline_->GetVideoPipeline()->SetClient(client);
   media_pipeline_->InitializeVideo(
-      configs, scoped_ptr<CodedFrameProvider>(), status_cb);
+      configs, client, video_frame_provider_.Pass(), status_cb);
 }
 
 void MediaPipelineHost::StartPlayingFrom(base::TimeDelta time) {
   DCHECK(thread_checker_.CalledOnValidThread());
   media_pipeline_->StartPlayingFrom(time);
 }
 
 void MediaPipelineHost::Flush(const ::media::PipelineStatusCB& status_cb) {
   DCHECK(thread_checker_.CalledOnValidThread());
   media_pipeline_->Flush(status_cb);
 }
 
 void MediaPipelineHost::Stop() {
   DCHECK(thread_checker_.CalledOnValidThread());
   media_pipeline_->Stop();
 }
 
 void MediaPipelineHost::SetPlaybackRate(double playback_rate) {
   DCHECK(thread_checker_.CalledOnValidThread());
   media_pipeline_->SetPlaybackRate(playback_rate);
 }
 
 void MediaPipelineHost::SetVolume(TrackId track_id, float volume) {
   DCHECK(thread_checker_.CalledOnValidThread());
   CHECK(track_id == kAudioTrackId);
-  media_pipeline_->GetAudioPipeline()->SetVolume(volume);
+  media_pipeline_->SetVolume(volume);
 }
 
 void MediaPipelineHost::SetCdm(BrowserCdmCast* cdm) {
   DCHECK(thread_checker_.CalledOnValidThread());
   media_pipeline_->SetCdm(cdm);
 }
 
 void MediaPipelineHost::NotifyPipeWrite(TrackId track_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   MediaTrackMap::iterator it = media_track_map_.find(track_id);
   if (it == media_track_map_.end())
     return;
 
   MediaTrackHost* media_track_host = it->second;
   if (!media_track_host->pipe_write_cb.is_null())
     media_track_host->pipe_write_cb.Run();
 }
 
 }  // namespace media
 }  // namespace chromecast