Replace AudioDecoder::media_format() with AudioDecoderConfig.

Also includes some cleanup for AudioParameter users including a new helper method GetBytesPerSecond().

BUG=28206
TEST=media_unittests, test_shell_tests, etc...

Review URL: http://codereview.chromium.org/6903007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83098 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 1 deletions

diff --git a/media/audio/audio_parameters.h b/media/audio/audio_parameters.h
index 2842bc1..ac08067 100644
--- a/media/audio/audio_parameters.h
+++ b/media/audio/audio_parameters.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,6 +6,7 @@
 #define MEDIA_AUDIO_AUDIO_PARAMETERS_H_
 
 #include "base/basictypes.h"
+#include "media/base/audio_decoder_config.h"
 
 struct AudioParameters {
   // Compare is useful when AudioParameters is used as a key in std::map.
@@ -30,6 +31,8 @@ struct AudioParameters {
 
   AudioParameters();
 
+  explicit AudioParameters(const media::AudioDecoderConfig& config);
+
   AudioParameters(Format format, int channels, int sample_rate,
                   int bits_per_sample, int samples_per_packet);
 
@@ -40,6 +43,9 @@ struct AudioParameters {
   // Returns size of audio packets in bytes.
   int GetPacketSize() const;
 
+  // Returns the number of bytes representing one second of audio.
+  int GetBytesPerSecond() const;
+
   Format format;           // Format of the stream.
   int channels;            // Number of channels.
   int sample_rate;         // Sampling frequency/rate.