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 501 matching lines @@
   // start the clock.
   bool waiting_for_clock_update_;
 
   // Status of the pipeline.  Initialized to PIPELINE_OK which indicates that
   // the pipeline is operating correctly. Any other value indicates that the
   // pipeline is stopped or is stopping.  Clients can call the Stop() method to
   // reset the pipeline state, and restore this to PIPELINE_OK.
   PipelineStatus status_;
 
   // Whether the media contains rendered audio and video streams.
+  // TODO(fischman,scherkus): replace these with checks for
+  // {audio,video}_decoder_ once extraction of {Audio,Video}Decoder from the
+  // Filter heirarchy is done.
   bool has_audio_;
   bool has_video_;
 
   // The following data members are only accessed by tasks posted to
   // |message_loop_|.
 
   // Member that tracks the current state.
   State state_;
 
   // For kSeeking we need to remember where we're seeking between filter
@@ skipping 37 matching lines @@
   // Renderer references used for setting the volume and determining
   // when playback has finished.
   scoped_refptr<AudioRenderer> audio_renderer_;
   scoped_refptr<VideoRenderer> video_renderer_;
 
   // Demuxer reference used for setting the preload value.
   scoped_refptr<Demuxer> demuxer_;
 
   // Helper class that stores filter references during pipeline
   // initialization.
-  class PipelineInitState;
+  struct PipelineInitState;
   scoped_ptr<PipelineInitState> pipeline_init_state_;
 
   // Statistics.
   PipelineStatistics statistics_;
   // Time of pipeline creation; is non-zero only until the pipeline first
   // reaches "kStarted", at which point it is used & zeroed out.
   base::Time creation_time_;
 
   // Approximates the rate at which the media is being downloaded.
   DownloadRateMonitor download_rate_monitor_;
 
   // 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_