[Chromecast] Upgrade to new CMA backend API

chromecast/media/cma/pipeline/audio_pipeline_impl.h

Index: chromecast/media/cma/pipeline/audio_pipeline_impl.h
diff --git a/chromecast/media/cma/pipeline/audio_pipeline_impl.h b/chromecast/media/cma/pipeline/audio_pipeline_impl.h
index 31cadf91680554bad62381e9a485743b125ed765..9afe19b0d5617dae08fe847e28c3d4c091069ff4 100644
--- a/chromecast/media/cma/pipeline/audio_pipeline_impl.h
+++ b/chromecast/media/cma/pipeline/audio_pipeline_impl.h
@@ -10,8 +10,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "chromecast/media/cma/pipeline/audio_pipeline.h"
 #include "chromecast/media/cma/pipeline/av_pipeline_client.h"
+#include "chromecast/public/media/media_pipeline_backend.h"
 #include "chromecast/public/media/stream_id.h"
 
 namespace media {
@@ -21,17 +21,16 @@ class VideoDecoderConfig;
 
 namespace chromecast {
 namespace media {
-class AudioPipelineDevice;
 class AvPipelineImpl;
 class BrowserCdmCast;
 class BufferingState;
 class CodedFrameProvider;
 
-class AudioPipelineImpl : public AudioPipeline {
+class AudioPipelineImpl {

[slan, 2015/10/07 20:56:16]

Can this just be called AudioPipeline now that it does not implement anything?
This applies to:

AudioPipelineImpl
VideoPipelineImpl
MediaPipelineImpl
AvPipelineImpl

[kmackay, 2015/10/09 20:35:40]

I will rename things in a separate CL.

  public:
-  // |buffering_controller| can be NULL.
-  explicit AudioPipelineImpl(AudioPipelineDevice* audio_device);
-  ~AudioPipelineImpl() override;
+  AudioPipelineImpl(MediaPipelineBackend::AudioDecoder* decoder,
+                    const AvPipelineClient& client);
+  ~AudioPipelineImpl();
 
   // Input port of the pipeline.
   void SetCodedFrameProvider(scoped_ptr<CodedFrameProvider> frame_provider);
@@ -52,9 +51,11 @@ class AudioPipelineImpl : public AudioPipeline {
   // Update the playback statistics for this audio stream.
   void UpdateStatistics();
 
-  // AudioPipeline implementation.
-  void SetClient(const AvPipelineClient& client) override;
-  void SetVolume(float volume) override;
+  void SetVolume(float volume);
+
+  void OnBufferPushed(MediaPipelineBackend::BufferStatus status);
+  void OnEndOfStream();
+  void OnError();
 
  private:
   void OnFlushDone(const ::media::PipelineStatusCB& status_cb);
@@ -62,7 +63,7 @@ class AudioPipelineImpl : public AudioPipeline {
                       const ::media::AudioDecoderConfig& audio_config,
                       const ::media::VideoDecoderConfig& video_config);
 
-  AudioPipelineDevice* audio_device_;
+  MediaPipelineBackend::AudioDecoder* decoder_;
 
   scoped_ptr<AvPipelineImpl> av_pipeline_impl_;
   AvPipelineClient audio_client_;