Moved AudioUtil static functions to AudioManager interfaces

media/audio/mac/audio_low_latency_output_mac.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/mac/audio_low_latency_output_mac.h"
 
 #include <CoreServices/CoreServices.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 63 matching lines @@
   format_.mFramesPerPacket = 1;
   format_.mBytesPerPacket = (format_.mBitsPerChannel * params.channels()) / 8;
   format_.mBytesPerFrame = format_.mBytesPerPacket;
   format_.mReserved = 0;
 
   DVLOG(1) << "Desired ouput format: " << format_;
 
   // Calculate the number of sample frames per callback.
   number_of_frames_ = params.GetBytesPerBuffer() / format_.mBytesPerPacket;
   DVLOG(1) << "Number of frames per callback: " << number_of_frames_;
-  CHECK_EQ(number_of_frames_, GetAudioHardwareBufferSize());
+  const AudioParameters parameters =
+      manager_->GetDefaultOutputStreamParameters();
+  CHECK_EQ(number_of_frames_,
+           static_cast<size_t>(parameters.frames_per_buffer()));
 }
 
 AUAudioOutputStream::~AUAudioOutputStream() {
 }
 
 bool AUAudioOutputStream::Open() {
   // Obtain the current input device selected by the user.
   UInt32 size = sizeof(output_device_id_);
   OSStatus result = AudioObjectGetPropertyData(kAudioObjectSystemObject,
                                                &kDefaultOutputDeviceAddress,
@@ skipping 65 matching lines @@
       sizeof(format_));
   if (result != noErr) {
     OSSTATUS_DLOG(WARNING, result)
         << "AudioUnitSetProperty(kAudioUnitProperty_StreamFormat) failed.";
     return false;
   }
 
   // Set the buffer frame size.
   // WARNING: Setting this value changes the frame size for all audio units in
   // the current process.  It's imperative that the input and output frame sizes
-  // be the same as audio_util::GetAudioHardwareBufferSize().
+  // be the same as the frames_per_buffer() returned by
+  // GetDefaultOutputStreamParameters.
   // See http://crbug.com/154352 for details.
   UInt32 buffer_size = number_of_frames_;
   result = AudioUnitSetProperty(
       output_unit_,
       kAudioDevicePropertyBufferFrameSize,
       kAudioUnitScope_Output,
       0,
       &buffer_size,
       sizeof(buffer_size));
   if (result != noErr) {
@@ skipping 227 matching lines @@
   if (now_ns > output_time_ns)
     return 0;
 
   double delay_frames = static_cast<double>
       (1e-9 * (output_time_ns - now_ns) * format_.mSampleRate);
 
   return (delay_frames + hardware_latency_frames_);
 }
 
 }  // namespace media