Remove OnMoreIOData()

media/audio/mac/audio_auhal_mac.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/mac/audio_auhal_mac.h"
 
 #include <CoreServices/CoreServices.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 33 matching lines @@
   // Finally set the actual length.
   bus->set_frames(frames);
 }
 
 AUHALStream::AUHALStream(
     AudioManagerMac* manager,
     const AudioParameters& params,
     AudioDeviceID device)
     : manager_(manager),
       params_(params),
-      input_channels_(params_.input_channels()),
       output_channels_(params_.channels()),
       number_of_frames_(params_.frames_per_buffer()),
       source_(NULL),
       device_(device),
       audio_unit_(0),
       volume_(1),
       hardware_latency_frames_(0),
       stopped_(false),
-      input_buffer_list_(NULL),
       current_hardware_pending_bytes_(0) {
   // We must have a manager.
   DCHECK(manager_);
 
   VLOG(1) << "AUHALStream::AUHALStream()";
   VLOG(1) << "Device: " << device;
-  VLOG(1) << "Input channels: " << input_channels_;
   VLOG(1) << "Output channels: " << output_channels_;
   VLOG(1) << "Sample rate: " << params_.sample_rate();
   VLOG(1) << "Buffer size: " << number_of_frames_;
 }
 
 AUHALStream::~AUHALStream() {
 }
 
 bool AUHALStream::Open() {
-  // Get the total number of input and output channels that the
+  // Get the total number of output channels that the
   // hardware supports.
-  int device_input_channels;
-  bool got_input_channels = AudioManagerMac::GetDeviceChannels(
-      device_,
-      kAudioDevicePropertyScopeInput,
-      &device_input_channels);
-
   int device_output_channels;
   bool got_output_channels = AudioManagerMac::GetDeviceChannels(
       device_,
       kAudioDevicePropertyScopeOutput,
       &device_output_channels);
 
-  // Sanity check the requested I/O channels.
-  if (!got_input_channels ||
-      input_channels_ < 0 || input_channels_ > device_input_channels) {
-    LOG(ERROR) << "AudioDevice does not support requested input channels.";
-    return false;
-  }
-
+  // Sanity check the requested output channels.
   if (!got_output_channels ||
       output_channels_ <= 0 || output_channels_ > device_output_channels) {
     LOG(ERROR) << "AudioDevice does not support requested output channels.";
     return false;
   }
 
   // The requested sample-rate must match the hardware sample-rate.
   int sample_rate = AudioManagerMac::HardwareSampleRateForDevice(device_);
 
   if (sample_rate != params_.sample_rate()) {
     LOG(ERROR) << "Requested sample-rate: " << params_.sample_rate()
                << " must match the hardware sample-rate: " << sample_rate;
     return false;
   }
 
-  CreateIOBusses();
+  // The output bus will wrap the AudioBufferList given to us in
+  // the Render() callback.
+  DCHECK_GT(output_channels_, 0);
+  output_bus_ = AudioBus::CreateWrapper(output_channels_);
 
   bool configured = ConfigureAUHAL();
   if (configured)
     hardware_latency_frames_ = GetHardwareLatency();
 
   return configured;
 }
 
 void AUHALStream::Close() {
-  if (input_buffer_list_) {
-    input_buffer_list_storage_.reset();
-    input_buffer_list_ = NULL;
-    input_bus_.reset(NULL);
-    output_bus_.reset(NULL);
-  }
-
   if (audio_unit_) {
     OSStatus result = AudioUnitUninitialize(audio_unit_);
     OSSTATUS_DLOG_IF(ERROR, result != noErr, result)
         << "AudioUnitUninitialize() failed.";
     result = AudioComponentInstanceDispose(audio_unit_);
     OSSTATUS_DLOG_IF(ERROR, result != noErr, result)
         << "AudioComponentInstanceDispose() failed.";
   }
 
   // Inform the audio manager that we have been closed. This will cause our
@@ skipping 62 matching lines @@
 
 // Pulls on our provider to get rendered audio stream.
 // Note to future hackers of this function: Do not add locks which can
 // be contended in the middle of stream processing here (starting and stopping
 // the stream are ok) because this is running on a real-time thread.
 OSStatus AUHALStream::Render(
     AudioUnitRenderActionFlags* flags,
     const AudioTimeStamp* output_time_stamp,
     UInt32 bus_number,
     UInt32 number_of_frames,
-    AudioBufferList* io_data) {
+    AudioBufferList* data) {
   TRACE_EVENT0("audio", "AUHALStream::Render");
 
   // If the stream parameters change for any reason, we need to insert a FIFO
   // since the OnMoreData() pipeline can't handle frame size changes.
   if (number_of_frames != number_of_frames_) {
     // Create a FIFO on the fly to handle any discrepancies in callback rates.
     if (!audio_fifo_) {
       VLOG(1) << "Audio frame size changed from " << number_of_frames_ << " to "
               << number_of_frames << "; adding FIFO to compensate.";
       audio_fifo_.reset(new AudioPullFifo(
           output_channels_,
           number_of_frames_,
           base::Bind(&AUHALStream::ProvideInput, base::Unretained(this))));
     }
-
-    // Synchronous IO is not supported in this state.
-    if (input_channels_ > 0)
-      input_bus_->Zero();
-  } else {
-    if (input_channels_ > 0 && input_buffer_list_) {
-      // Get the input data.  |input_buffer_list_| is wrapped
-      // to point to the data allocated in |input_bus_|.
-      OSStatus result = AudioUnitRender(audio_unit_,
-                                        flags,
-                                        output_time_stamp,
-                                        1,
-                                        number_of_frames,
-                                        input_buffer_list_);
-      if (result != noErr)
-        ZeroBufferList(input_buffer_list_);
-    }
   }
 
   // Make |output_bus_| wrap the output AudioBufferList.
-  WrapBufferList(io_data, output_bus_.get(), number_of_frames);
+  WrapBufferList(data, output_bus_.get(), number_of_frames);
 
   // Update the playout latency.
   const double playout_latency_frames = GetPlayoutLatency(output_time_stamp);
   current_hardware_pending_bytes_ = static_cast<uint32>(
       (playout_latency_frames + 0.5) * params_.GetBytesPerFrame());
 
   if (audio_fifo_)
     audio_fifo_->Consume(output_bus_.get(), output_bus_->frames());
   else
     ProvideInput(0, output_bus_.get());
 
   return noErr;
 }
 
 void AUHALStream::ProvideInput(int frame_delay, AudioBus* dest) {
   base::AutoLock auto_lock(source_lock_);
   if (!source_) {
     dest->Zero();
     return;
   }
 
   // Supply the input data and render the output data.
-  source_->OnMoreIOData(
-      input_bus_.get(),
+  source_->OnMoreData(
       dest,
       AudioBuffersState(0,
                         current_hardware_pending_bytes_ +
                             frame_delay * params_.GetBytesPerFrame()));
   dest->Scale(volume_);
 }
 
 // AUHAL callback.
 OSStatus AUHALStream::InputProc(
     void* user_data,
@@ skipping 78 matching lines @@
   // the bots, probably less so in the wild.
   if (now_ns > output_time_ns)
     return 0;
 
   double delay_frames = static_cast<double>
       (1e-9 * (output_time_ns - now_ns) * output_format_.mSampleRate);
 
   return (delay_frames + hardware_latency_frames_);
 }
 
-void AUHALStream::CreateIOBusses() {
-  if (input_channels_ > 0) {
-    // Allocate storage for the AudioBufferList used for the
-    // input data from the input AudioUnit.
-    // We allocate enough space for with one AudioBuffer per channel.
-    size_t buffer_list_size = offsetof(AudioBufferList, mBuffers[0]) +
-        (sizeof(AudioBuffer) * input_channels_);
-    input_buffer_list_storage_.reset(new uint8[buffer_list_size]);
-
-    input_buffer_list_ =
-        reinterpret_cast<AudioBufferList*>(input_buffer_list_storage_.get());
-    input_buffer_list_->mNumberBuffers = input_channels_;
-
-    // |input_bus_| allocates the storage for the PCM input data.
-    input_bus_ = AudioBus::Create(input_channels_, number_of_frames_);
-
-    // Make the AudioBufferList point to the memory in |input_bus_|.
-    UInt32 buffer_size_bytes = input_bus_->frames() * sizeof(Float32);
-    for (size_t i = 0; i < input_buffer_list_->mNumberBuffers; ++i) {
-      input_buffer_list_->mBuffers[i].mNumberChannels = 1;
-      input_buffer_list_->mBuffers[i].mDataByteSize = buffer_size_bytes;
-      input_buffer_list_->mBuffers[i].mData = input_bus_->channel(i);
-    }
-  }
-
-  // The output bus will wrap the AudioBufferList given to us in
-  // the Render() callback.
-  DCHECK_GT(output_channels_, 0);
-  output_bus_ = AudioBus::CreateWrapper(output_channels_);
-}
-
-bool AUHALStream::EnableIO(bool enable, UInt32 scope) {
+bool AUHALStream::EnableIO() {

[DaleCurtis, 2014/05/15 17:53:22]

Just inline this with the method below?

[no longer working on chromium, 2014/05/16 13:52:37]

Done.

   // See Apple technote for details about the EnableIO property.
   // Note that we use bus 1 for input and bus 0 for output:
   // http://developer.apple.com/library/mac/#technotes/tn2091/_index.html
-  UInt32 enable_IO = enable ? 1 : 0;
+  UInt32 enable_IO = 1;
+  UInt32 scope = kAudioUnitScope_Output;
   OSStatus result = AudioUnitSetProperty(
       audio_unit_,
       kAudioOutputUnitProperty_EnableIO,
       scope,
-      (scope == kAudioUnitScope_Input) ? 1 : 0,
+      0,
       &enable_IO,
       sizeof(enable_IO));
   return (result == noErr);
 }
 
 bool AUHALStream::SetStreamFormat(
     AudioStreamBasicDescription* desc,
     int channels,
     UInt32 scope,
     UInt32 element) {
@@ skipping 15 matching lines @@
       audio_unit_,
       kAudioUnitProperty_StreamFormat,
       scope,
       element,
       &format,
       sizeof(format));
   return (result == noErr);
 }
 
 bool AUHALStream::ConfigureAUHAL() {
-  if (device_ == kAudioObjectUnknown ||
-      (input_channels_ == 0 && output_channels_ == 0))
+  if (device_ == kAudioObjectUnknown || output_channels_ == 0)
     return false;
 
   AudioComponentDescription desc = {
       kAudioUnitType_Output,
       kAudioUnitSubType_HALOutput,
       kAudioUnitManufacturer_Apple,
       0,
       0
   };
   AudioComponent comp = AudioComponentFindNext(0, &desc);
   if (!comp)
     return false;
 
   OSStatus result = AudioComponentInstanceNew(comp, &audio_unit_);
   if (result != noErr) {
     OSSTATUS_DLOG(ERROR, result) << "AudioComponentInstanceNew() failed.";
     return false;
   }
 
-  // Enable input and output as appropriate.
-  if (!EnableIO(input_channels_ > 0, kAudioUnitScope_Input))
-    return false;
-  if (!EnableIO(output_channels_ > 0, kAudioUnitScope_Output))
+  // Enable output as appropriate.
+  if (!EnableIO())
     return false;
 
   // Set the device to be used with the AUHAL AudioUnit.
   result = AudioUnitSetProperty(
       audio_unit_,
       kAudioOutputUnitProperty_CurrentDevice,
       kAudioUnitScope_Global,
       0,
       &device_,
       sizeof(AudioDeviceID));
   if (result != noErr)
     return false;
 
   // Set stream formats.
   // See Apple's tech note for details on the peculiar way that
   // inputs and outputs are handled in the AUHAL concerning scope and bus
   // (element) numbers:
   // http://developer.apple.com/library/mac/#technotes/tn2091/_index.html
 
-  if (input_channels_ > 0) {
-    if (!SetStreamFormat(&input_format_,
-                         input_channels_,
-                         kAudioUnitScope_Output,
-                         1))
-      return false;
-  }
-
-  if (output_channels_ > 0) {
-    if (!SetStreamFormat(&output_format_,
-                         output_channels_,
-                         kAudioUnitScope_Input,
-                         0))
-      return false;
+  if (!SetStreamFormat(&output_format_,
+                       output_channels_,
+                       kAudioUnitScope_Input,
+                       0)) {
+    return false;
   }
 
   // Set the buffer frame size.
   // WARNING: Setting this value changes the frame size for all output audio
   // units in the current process.  As a result, the AURenderCallback must be
   // able to handle arbitrary buffer sizes and FIFO appropriately.
   UInt32 buffer_size = 0;
   UInt32 property_size = sizeof(buffer_size);
   result = AudioUnitGetProperty(audio_unit_,
                                 kAudioDevicePropertyBufferFrameSize,
@@ skipping 42 matching lines @@
   result = AudioUnitInitialize(audio_unit_);
   if (result != noErr) {
     OSSTATUS_DLOG(ERROR, result) << "AudioUnitInitialize() failed.";
     return false;
   }
 
   return true;
 }
 
 }  // namespace media