[Chromecast] Upgrade to new CMA backend API

chromecast/renderer/media/renderer_media_pipeline.h

Index: chromecast/renderer/media/renderer_media_pipeline.h
diff --git a/chromecast/media/cma/pipeline/media_pipeline.h b/chromecast/renderer/media/renderer_media_pipeline.h
similarity index 65%
rename from chromecast/media/cma/pipeline/media_pipeline.h
rename to chromecast/renderer/media/renderer_media_pipeline.h
index 625917ceecbd9cab7f14d5797a815e0bff7f407f..ac9f9d4565751079c106c901588b4b9802f36c07 100644
--- a/chromecast/media/cma/pipeline/media_pipeline.h
+++ b/chromecast/renderer/media/renderer_media_pipeline.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMECAST_MEDIA_CMA_PIPELINE_MEDIA_PIPELINE_H_
-#define CHROMECAST_MEDIA_CMA_PIPELINE_MEDIA_PIPELINE_H_
+#ifndef CHROMECAST_RENDERER_MEDIA_RENDERER_MEDIA_PIPELINE_H_
+#define CHROMECAST_RENDERER_MEDIA_RENDERER_MEDIA_PIPELINE_H_
 
 #include <vector>
 
@@ -14,7 +14,6 @@
 
 namespace media {
 class AudioDecoderConfig;
-class BrowserCdm;
 class VideoDecoderConfig;
 }
 
@@ -25,10 +24,10 @@ class CodedFrameProvider;
 struct MediaPipelineClient;
 class VideoPipeline;
 
-class MediaPipeline {
+class RendererMediaPipeline {
  public:
-  MediaPipeline() {}
-  virtual ~MediaPipeline() {}
+  RendererMediaPipeline() {}

[slan, 2015/10/07 02:06:47]

This class can also be simplified in the way that AudioPipeline and
VideoPipeline can.

[kmackay, 2015/10/07 16:37:58]

Done.

+  virtual ~RendererMediaPipeline() {}
 
   // Set the media pipeline client.
   virtual void SetClient(const MediaPipelineClient& client) = 0;
@@ -37,19 +36,18 @@ class MediaPipeline {
   // The CDM is refered by its id.
   virtual void SetCdm(int cdm_id) = 0;
 
-  // Return the audio/video pipeline owned by the MediaPipeline.
+  // Return the audio/video pipeline owned by the RendererMediaPipeline.
   virtual AudioPipeline* GetAudioPipeline() const = 0;
   virtual VideoPipeline* GetVideoPipeline() const = 0;
 
   // Create an audio/video pipeline.
-  // MediaPipeline owns the resulting audio/video pipeline.
+  // RendererMediaPipeline owns the resulting audio/video pipeline.
   // Only one audio and one video pipeline can be created.
-  virtual void InitializeAudio(
-      const ::media::AudioDecoderConfig& config,
-      scoped_ptr<CodedFrameProvider> frame_provider,
-      const ::media::PipelineStatusCB& status_cb) = 0;
+  virtual void InitializeAudio(const ::media::AudioDecoderConfig& config,
+                               scoped_ptr<CodedFrameProvider> frame_provider,
+                               const ::media::PipelineStatusCB& status_cb) = 0;
   virtual void InitializeVideo(
-      const std::vector<::media::VideoDecoderConfig>& configs,
+      const std::vector< ::media::VideoDecoderConfig>& configs,
       scoped_ptr<CodedFrameProvider> frame_provider,
       const ::media::PipelineStatusCB& status_cb) = 0;
 
@@ -62,10 +60,10 @@ class MediaPipeline {
   virtual void SetPlaybackRate(double playback_rate) = 0;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MediaPipeline);
+  DISALLOW_COPY_AND_ASSIGN(RendererMediaPipeline);
 };
 
 }  // namespace media
 }  // namespace chromecast
 
-#endif  // CHROMECAST_MEDIA_CMA_PIPELINE_MEDIA_PIPELINE_H_
+#endif  // CHROMECAST_RENDERER_MEDIA_RENDERER_MEDIA_PIPELINE_H_