Switch the input code to use AudioBlockFifo

media/audio/mac/audio_low_latency_input_mac.h

 // 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.
 //
 // Implementation of AudioInputStream for Mac OS X using the special AUHAL
 // input Audio Unit present in OS 10.4 and later.
 // The AUHAL input Audio Unit is for low-latency audio I/O.
 //
 // Overview of operation:
 //
@@ skipping 27 matching lines @@
 
 #include <AudioUnit/AudioUnit.h>
 #include <CoreAudio/CoreAudio.h>
 
 #include "base/cancelable_callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/audio/agc_audio_stream.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
+#include "media/base/audio_block_fifo.h"
 
 namespace media {
 
 class AudioBus;
-class AudioFifo;
 class AudioManagerMac;
 class DataBuffer;
 
 class AUAudioInputStream : public AgcAudioStream<AudioInputStream> {
  public:
   // The ctor takes all the usual parameters, plus |manager| which is the
   // the audio manager who is creating this object.
   AUAudioInputStream(AudioManagerMac* manager,
                      const AudioParameters& input_params,
                      AudioDeviceID audio_device_id);
@@ skipping 78 matching lines @@
   // True after successfull Start(), false after successful Stop().
   bool started_;
 
   // Fixed capture hardware latency in frames.
   double hardware_latency_frames_;
 
   // The number of channels in each frame of audio data, which is used
   // when querying the volume of each channel.
   int number_of_channels_in_frame_;
 
-  // Dynamically allocated FIFO used to accumulates recorded data when
-  // CoreAudio delivers non-requested frame size of data.
-  scoped_ptr<media::AudioFifo> fifo_;
+  // FIFO used to accumulates recorded data.
+  media::AudioBlockFifo fifo_;
 
   // Used to defer Start() to workaround http://crbug.com/160920.
   base::CancelableClosure deferred_start_cb_;
 
-  // Audio bus used for storage of deinterleaved data for the OnData callback.
-  scoped_ptr<media::AudioBus> audio_bus_;
-
-  // Audio bus used to convert interleaved data to deinterleaved data before
-  // storing data to FIFO or delivering data via OnData callback.
-  scoped_ptr<media::AudioBus> audio_wrapper_;
-
   DISALLOW_COPY_AND_ASSIGN(AUAudioInputStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_MAC_AUDIO_LOW_LATENCY_INPUT_MAC_H_