[Chromecast] Upgrade to new CMA backend API

chromecast/browser/media/media_pipeline_host.h

 // 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.
 
 #ifndef CHROMECAST_BROWSER_MEDIA_MEDIA_PIPELINE_HOST_H_
 #define CHROMECAST_BROWSER_MEDIA_MEDIA_PIPELINE_HOST_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 15 matching lines @@
 class AudioDecoderConfig;
 class VideoDecoderConfig;
 }
 
 namespace chromecast {
 class TaskRunnerImpl;
 
 namespace media {
 struct AvPipelineClient;
 class BrowserCdmCast;
+struct MediaPipelineClient;
+struct VideoPipelineClient;
+class CodedFrameProvider;
 class MediaPipelineBackend;
-struct MediaPipelineClient;
 struct MediaPipelineDeviceParams;
 class MediaPipelineImpl;
-struct VideoPipelineClient;
 
 class MediaPipelineHost {
  public:
   // Factory method to create a MediaPipelineBackend
-  typedef base::Callback<scoped_ptr<media::MediaPipelineBackend>(
-      const MediaPipelineDeviceParams&)> CreateDeviceComponentsCB;
+  typedef base::Callback<scoped_ptr<MediaPipelineBackend>(
+      const MediaPipelineDeviceParams&)> CreateBackendCB;
 
   MediaPipelineHost();
   ~MediaPipelineHost();
 
   void Initialize(LoadType load_type,
                   const MediaPipelineClient& client,
-                  const CreateDeviceComponentsCB& create_device_components_cb);
+                  const CreateBackendCB& create_backend_cb);
 
   void SetAvPipe(TrackId track_id,
                  scoped_ptr<base::SharedMemory> shared_mem,
                  const base::Closure& pipe_read_activity_cb,
                  const base::Closure& av_pipe_set_cb);
   void AudioInitialize(TrackId track_id,
                        const AvPipelineClient& client,
                        const ::media::AudioDecoderConfig& config,
                        const ::media::PipelineStatusCB& status_cb);
   void VideoInitialize(TrackId track_id,
                        const VideoPipelineClient& client,
-                       const std::vector<::media::VideoDecoderConfig>& configs,
+                       const std::vector< ::media::VideoDecoderConfig>& configs,
                        const ::media::PipelineStatusCB& status_cb);
   void StartPlayingFrom(base::TimeDelta time);
   void Flush(const ::media::PipelineStatusCB& status_cb);
   void Stop();
 
   void SetPlaybackRate(double playback_rate);
   void SetVolume(TrackId track_id, float playback_rate);
   void SetCdm(BrowserCdmCast* cdm);
 
   void NotifyPipeWrite(TrackId track_id);
 
  private:
   base::ThreadChecker thread_checker_;
 
   scoped_ptr<TaskRunnerImpl> task_runner_;
   scoped_ptr<MediaPipelineImpl> media_pipeline_;
 
+  scoped_ptr<CodedFrameProvider> audio_frame_provider_;
+  scoped_ptr<CodedFrameProvider> video_frame_provider_;
+
   // The shared memory for a track id must be valid until Stop is invoked on
   // that track id.
   struct MediaTrackHost;
   typedef std::map<TrackId, MediaTrackHost*> MediaTrackMap;
   MediaTrackMap media_track_map_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPipelineHost);
 };
 
 }  // namespace media
 }  // namespace chromecast
 
 #endif  // CHROMECAST_BROWSER_MEDIA_MEDIA_PIPELINE_HOST_H_