WASAPIAudioInputStream: Revert to the previous buffer size calculation.

media/audio/win/audio_low_latency_input_win.cc

 // 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.
 
 #include "media/audio/win/audio_low_latency_input_win.h"
 
 #include <cmath>
 #include <memory>
 
 #include "base/logging.h"
@@ skipping 338 matching lines @@
   // 1) The recorded buffer size is smaller, or does not match exactly with,
   //    the selected packet size used in each callback.
   // 2) The selected buffer size is larger than the recorded buffer size in
   //    each event.
   // In the case where no resampling is required, a single buffer should be
   // enough but in case we get buffers that don't match exactly, we'll go with
   // two. Same applies if we need to resample and the buffer ratio is perfect.
   // However if the buffer ratio is imperfect, we will need 3 buffers to safely
   // be able to buffer up data in cases where a conversion requires two audio
   // buffers (and we need to be able to write to the third one).
+  size_t capture_buffer_size =
+      std::max(2 * endpoint_buffer_size_frames_ * frame_size_,
+               2 * packet_size_frames_ * frame_size_);
+  int buffers_required = capture_buffer_size / packet_size_bytes_;
+  if (converter_ && imperfect_buffer_size_conversion_)
+    ++buffers_required;
+
   DCHECK(!fifo_);
-  const int buffers_required =
-      converter_ && imperfect_buffer_size_conversion_ ? 3 : 2;
   fifo_.reset(new AudioBlockFifo(format_.nChannels, packet_size_frames_,
                                  buffers_required));
 
-  DVLOG(1) << "AudioBlockFifo needs " << buffers_required << " buffers";
+  DVLOG(1) << "AudioBlockFifo buffer count: " << buffers_required;
 
   LARGE_INTEGER now_count = {};
   bool recording = true;
   bool error = false;
   double volume = GetVolume();
   HANDLE wait_array[2] = {stop_capture_event_.Get(),
                           audio_samples_ready_event_.Get()};
 
   base::win::ScopedComPtr<IAudioClock> audio_clock;
   audio_client_->GetService(__uuidof(IAudioClock), audio_clock.ReceiveVoid());
@@ skipping 446 matching lines @@
                             OPEN_RESULT_MAX + 1);
 }
 
 double WASAPIAudioInputStream::ProvideInput(AudioBus* audio_bus,
                                             uint32_t frames_delayed) {
   fifo_->Consume()->CopyTo(audio_bus);
   return 1.0;
 }
 
 }  // namespace media