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, 13 insertions, 1 deletions

diff --git a/media/audio/audio_parameters.cc b/media/audio/audio_parameters.cc
index d1d44a7..dfe2d07 100644
--- a/media/audio/audio_parameters.cc
+++ b/media/audio/audio_parameters.cc
@@ -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.
 
@@ -14,6 +14,14 @@ AudioParameters::AudioParameters()
       samples_per_packet(0) {
 }
 
+AudioParameters::AudioParameters(const media::AudioDecoderConfig& config)
+    : format(AUDIO_PCM_LINEAR),
+      channels(config.channels_per_sample),
+      sample_rate(config.sample_rate),
+      bits_per_sample(config.bits_per_channel),
+      samples_per_packet(0) {
+}
+
 AudioParameters::AudioParameters(Format format, int channels,
                                  int sample_rate, int bits_per_sample,
                                  int samples_per_packet)
@@ -38,6 +46,10 @@ int AudioParameters::GetPacketSize() const {
   return samples_per_packet * channels * bits_per_sample / 8;
 }
 
+int AudioParameters::GetBytesPerSecond() const {
+  return sample_rate * channels * bits_per_sample / 8;
+}
+
 bool AudioParameters::Compare::operator()(
     const AudioParameters& a,
     const AudioParameters& b) const {