Remove AudioDecoder from the Filter heirarchy.

media/base/pipeline.h

 // Copyright (c) 2012 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 MEDIA_BASE_PIPELINE_H_
 #define MEDIA_BASE_PIPELINE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 17 matching lines @@
 
 class AudioDecoder;
 class AudioRenderer;
 class Clock;
 class Filter;
 class FilterCollection;
 class MediaLog;
 class VideoDecoder;
 class VideoRenderer;
 
-// TODO(scherkus): this should be moved alongside host interface defintions.
-struct PipelineStatistics {
-  PipelineStatistics()
-      : audio_bytes_decoded(0),
-        video_bytes_decoded(0),
-        video_frames_decoded(0),
-        video_frames_dropped(0) {
-  }
-
-  uint32 audio_bytes_decoded;  // Should be uint64?
-  uint32 video_bytes_decoded;  // Should be uint64?
-  uint32 video_frames_decoded;
-  uint32 video_frames_dropped;
-};
-
 enum NetworkEvent {
   DOWNLOAD_CONTINUED,
   DOWNLOAD_PAUSED,
   CAN_PLAY_THROUGH
 };
 
 // Callback that executes when a network event occurs.
 // The parameter specifies the type of event that is being signalled.
 typedef base::Callback<void(NetworkEvent)> NetworkEventCB;
 
@@ skipping 541 matching lines @@
 
   // Callbacks for various pipeline operations.
   PipelineStatusCB seek_callback_;
   PipelineStatusCB stop_callback_;
   PipelineStatusCB ended_callback_;
   PipelineStatusCB error_callback_;
   NetworkEventCB network_callback_;
 
   // Reference to the filter(s) that constitute the pipeline.
   scoped_refptr<Filter> pipeline_filter_;
+  scoped_refptr<AudioDecoder> audio_decoder_;
 
   // Decoder reference used for signalling imminent shutdown.
   // This is a HACK necessary because WebMediaPlayerImpl::Destroy() holds the
   // renderer thread loop hostage for until PipelineImpl::Stop() calls its
   // callback.  http://crbug.com/110228 tracks removing this hack.
   scoped_refptr<VideoDecoder> video_decoder_;
 
   // Renderer references used for setting the volume and determining
   // when playback has finished.
   scoped_refptr<AudioRenderer> audio_renderer_;
@@ skipping 18 matching lines @@
 
   // True if the pipeline is actively downloading bytes, false otherwise.
   bool is_downloading_data_;
 
   DISALLOW_COPY_AND_ASSIGN(Pipeline);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_H_