Reland 501823002: Used native deinterleaved and float point format for the input streams

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 AudioBlockFifo;
 class AudioBus;
 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);
   // The dtor is typically called by the AudioManager only and it is usually
   // triggered by calling AudioInputStream::Close().
   virtual ~AUAudioInputStream();
 
   // Implementation of AudioInputStream.
   virtual bool Open() OVERRIDE;
   virtual void Start(AudioInputCallback* callback) OVERRIDE;
   virtual void Stop() OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual double GetMaxVolume() OVERRIDE;
   virtual void SetVolume(double volume) OVERRIDE;
   virtual double GetVolume() OVERRIDE;
 
   // Returns the current hardware sample rate for the default input device.
   MEDIA_EXPORT static int HardwareSampleRate();
 
   bool started() const { return started_; }
   AudioUnit audio_unit() { return audio_unit_; }
-  AudioBufferList* audio_buffer_list() { return &audio_buffer_list_; }
+  AudioBufferList* audio_buffer_list() { return audio_buffer_list_.get(); }
 
  private:
   // AudioOutputUnit callback.
   static OSStatus InputProc(void* user_data,
                             AudioUnitRenderActionFlags* flags,
                             const AudioTimeStamp* time_stamp,
                             UInt32 bus_number,
                             UInt32 number_of_frames,
                             AudioBufferList* io_data);
 
   // Pushes recorded data to consumer of the input audio stream.
-  OSStatus Provide(UInt32 number_of_frames, AudioBufferList* io_data,
+  OSStatus Provide(UInt32 number_of_frames,
+                   AudioBufferList* io_data,
                    const AudioTimeStamp* time_stamp);
 
   // Gets the fixed capture hardware latency and store it during initialization.
   // Returns 0 if not available.
   double GetHardwareLatency();
 
   // Gets the current capture delay value.
   double GetCaptureLatency(const AudioTimeStamp* input_time_stamp);
 
   // Gets the number of channels for a stream of audio data.
@@ skipping 21 matching lines @@
 
   // The special Audio Unit called AUHAL, which allows us to pass audio data
   // directly from a microphone, through the HAL, and to our application.
   // The AUHAL also enables selection of non default devices.
   AudioUnit audio_unit_;
 
   // The UID refers to the current input audio device.
   AudioDeviceID input_device_id_;
 
   // Provides a mechanism for encapsulating one or more buffers of audio data.
-  AudioBufferList audio_buffer_list_;
+  scoped_ptr<AudioBufferList, base::FreeDeleter> audio_buffer_list_;
 
   // Temporary storage for recorded data. The InputProc() renders into this
   // array as soon as a frame of the desired buffer size has been recorded.
-  scoped_ptr<uint8[]> audio_data_buffer_;
+  scoped_ptr<float, base::AlignedFreeDeleter> audio_data_buffer_;
 
   // 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_;
 
-  // FIFO used to accumulates recorded data.
-  media::AudioBlockFifo fifo_;
+  // Dynamically allocated FIFO used when CoreAudio asks for unexpected frame
+  // sizes.
+  scoped_ptr<AudioBlockFifo> fifo_;
+
+  // AudioBus wrapper for delievering data via AudioSourceCallback::OnData().
+  scoped_ptr<AudioBus> audio_wrapper_;
 
   // Used to defer Start() to workaround http://crbug.com/160920.
   base::CancelableClosure deferred_start_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(AUAudioInputStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_MAC_AUDIO_LOW_LATENCY_INPUT_MAC_H_