| Index: media/audio/mac/audio_auhal_mac.h
|
| diff --git a/media/audio/mac/audio_auhal_mac.h b/media/audio/mac/audio_auhal_mac.h
|
| index 5c697f58fa1f8a6316de32e1f55d445389909e63..58e06d20a53587559b35a978e5ef1b5590c86fe9 100644
|
| --- a/media/audio/mac/audio_auhal_mac.h
|
| +++ b/media/audio/mac/audio_auhal_mac.h
|
| @@ -33,8 +33,7 @@ class AudioPullFifo;
|
|
|
| // Implementation of AudioOuputStream for Mac OS X using the
|
| // AUHAL Audio Unit present in OS 10.4 and later.
|
| -// It is useful for low-latency output with optional synchronized
|
| -// input.
|
| +// It is useful for low-latency output.
|
| //
|
| // Overview of operation:
|
| // 1) An object of AUHALStream is created by the AudioManager
|
| @@ -88,8 +87,8 @@ class AUHALStream : public AudioOutputStream {
|
| // Called by either |audio_fifo_| or Render() to provide audio data.
|
| void ProvideInput(int frame_delay, AudioBus* dest);
|
|
|
| - // Helper method to enable input and output.
|
| - bool EnableIO(bool enable, UInt32 scope);
|
| + // Helper method to enable output.
|
| + bool EnableIO();
|
|
|
| // Sets the stream format on the AUHAL to PCM Float32 non-interleaved
|
| // for the given number of channels on the given scope and element.
|
| @@ -117,7 +116,6 @@ class AUHALStream : public AudioOutputStream {
|
|
|
| const AudioParameters params_;
|
| // For convenience - same as in params_.
|
| - const int input_channels_;
|
| const int output_channels_;
|
|
|
| // Buffer-size.
|
| @@ -131,7 +129,6 @@ class AUHALStream : public AudioOutputStream {
|
| base::Lock source_lock_;
|
|
|
| // Holds the stream format details such as bitrate.
|
| - AudioStreamBasicDescription input_format_;
|
| AudioStreamBasicDescription output_format_;
|
|
|
| // The audio device to use with the AUHAL.
|
| @@ -150,14 +147,7 @@ class AUHALStream : public AudioOutputStream {
|
| // The flag used to stop the streaming.
|
| bool stopped_;
|
|
|
| - // The input AudioUnit renders its data here.
|
| - scoped_ptr<uint8[]> input_buffer_list_storage_;
|
| - AudioBufferList* input_buffer_list_;
|
| -
|
| - // Holds the actual data for |input_buffer_list_|.
|
| - scoped_ptr<AudioBus> input_bus_;
|
| -
|
| - // Container for retrieving data from AudioSourceCallback::OnMoreIOData().
|
| + // Container for retrieving data from AudioSourceCallback::OnMoreData().
|
| scoped_ptr<AudioBus> output_bus_;
|
|
|
| // Dynamically allocated FIFO used when CoreAudio asks for unexpected frame
|
|
|