Fix flaky AudioStreamHandler initialization.

media/audio/sounds/audio_stream_handler.cc

 // Copyright 2013 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.
 
 #include "media/audio/sounds/audio_stream_handler.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/base/channel_layout.h"
 
 namespace media {
 
 namespace {
 
 // Volume percent.
 const double kOutputVolumePercent = 0.8;
 
+// The number of frames each OnMoreData() call will request.
+const int kDefaultFrameCount = 1024;
+
 AudioStreamHandler::TestObserver* g_observer_for_testing = NULL;
 AudioOutputStream::AudioSourceCallback* g_audio_source_for_testing = NULL;
 
 }  // namespace
 
 class AudioStreamHandler::AudioStreamContainer
     : public AudioOutputStream::AudioSourceCallback {
  public:
   AudioStreamContainer(const WavAudioHandler& wav_audio,
                        const AudioParameters& params)
@@ skipping 85 matching lines @@
 };
 
 AudioStreamHandler::AudioStreamHandler(const base::StringPiece& wav_data)
     : wav_audio_(wav_data),
       initialized_(false) {
   AudioManager* manager = AudioManager::Get();
   if (!manager) {
     LOG(ERROR) << "Can't get access to audio manager.";
     return;
   }
-  AudioParameters params(
-      AudioParameters::AUDIO_PCM_LOW_LATENCY,
-      GuessChannelLayout(wav_audio_.num_channels()),
-      wav_audio_.sample_rate(),
-      wav_audio_.bits_per_sample(),
-      manager->GetDefaultOutputStreamParameters().frames_per_buffer());
+  AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
+                         GuessChannelLayout(wav_audio_.num_channels()),
+                         wav_audio_.sample_rate(),
+                         wav_audio_.bits_per_sample(),
+                         kDefaultFrameCount);
   if (!params.IsValid()) {
     LOG(ERROR) << "Audio params are invalid.";
     return;
   }
   stream_.reset(new AudioStreamContainer(wav_audio_, params));
   initialized_ = true;
 }
 
 AudioStreamHandler::~AudioStreamHandler() {
   DCHECK(CalledOnValidThread());
@@ skipping 34 matching lines @@
   g_observer_for_testing = observer;
 }
 
 // static
 void AudioStreamHandler::SetAudioSourceForTesting(
     AudioOutputStream::AudioSourceCallback* source) {
   g_audio_source_for_testing = source;
 }
 
 }  // namespace media