WavAudioHandler no longer keeps state with AudioParameters.

Keeping internal state with AudioParameters was causing ambiguity among
callers of WavAudioHandler, particularly in longer wav files, where the
total number of frames exceeded default buffer lengths (1024 frames in
many cases). Construction of AudioParameters, which is intended to
describe an audio stream rather than an audio file, has been moved
outside of WavAudioHandler, and replaced by explicit accessors for
parameters describing the wav audio chunk.

Context (Google internal):
https://eureka-internal-review.git.corp.google.com/#/c/21997/

BUG=b/16680624

Review URL: https://codereview.chromium.org/1063633008

Cr-Commit-Position: refs/heads/master@{#325894}

1 files changed, 4 insertions, 5 deletions

diff --git a/media/audio/simple_sources.cc b/media/audio/simple_sources.cc
index caf4c4c..877f9fd 100644
--- a/media/audio/simple_sources.cc
+++ b/media/audio/simple_sources.cc
@@ -186,10 +186,9 @@ void FileSource::LoadWavFile(const base::FilePath& path_to_wav_file) {
   // modify the wav file's audio parameters since we'll be reading small slices
   // of it at a time and not the whole thing (like 10 ms at a time).
   AudioParameters file_audio_slice(
-      wav_audio_handler_->params().format(),
-      wav_audio_handler_->params().channel_layout(),
-      wav_audio_handler_->params().sample_rate(),
-      wav_audio_handler_->params().bits_per_sample(),
+      AudioParameters::AUDIO_PCM_LOW_LATENCY,
+      GuessChannelLayout(wav_audio_handler_->num_channels()),
+      wav_audio_handler_->sample_rate(), wav_audio_handler_->bits_per_sample(),
       params_.frames_per_buffer());
 
   file_audio_converter_.reset(
@@ -225,7 +224,7 @@ double FileSource::ProvideInput(AudioBus* audio_bus_into_converter,
                              &bytes_written);
   wav_file_read_pos_ += bytes_written;
   return 1.0;
-};
+}
 
 void FileSource::OnError(AudioOutputStream* stream) {
 }