Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/mac/audio_auhal_mac.h

 // 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.
 //
 // Implementation notes:
 //
 // - It is recommended to first acquire the native sample rate of the default
 //   output device and then use the same rate when creating this object.
 //   Use AudioManagerMac::HardwareSampleRate() to retrieve the sample rate.
 // - Calling Close() also leads to self destruction.
@@ skipping 11 matching lines @@
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
+#include "base/time/time.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager.h"
 #include "media/base/audio_parameters.h"
 
 namespace media {
 
 class AudioManagerMac;
 class AudioPullFifo;
 
 // Implementation of AudioOuputStream for Mac OS X using the
@@ skipping 78 matching lines @@
 
   // Creates the AUHAL, sets its stream format, buffer-size, etc.
   bool ConfigureAUHAL();
 
   // Uninitializes audio_unit_ if needed.
   void CloseAudioUnit();
 
   // Creates the input and output busses.
   void CreateIOBusses();
 
-  // Gets the fixed playout device hardware latency and stores it. Returns 0
-  // if not available.
-  double GetHardwareLatency();
+  // Returns the fixed hardware latency, or zero if not available.
+  base::TimeDelta GetHardwareLatency();
 
-  // Gets the current playout latency value.
-  double GetPlayoutLatency(const AudioTimeStamp* output_time_stamp);
+  // Returns the playout time for a given AudioTimeStamp.
+  base::TimeTicks GetPlayoutTime(const AudioTimeStamp* output_time_stamp);
 
   // Updates playout timestamp, current lost frames, and total lost frames and
   // glitches.
   void UpdatePlayoutTimestamp(const AudioTimeStamp* timestamp);
 
   // Called from the dtor and when the stream is reset.
   void ReportAndResetStats();
 
   // Our creator, the audio manager needs to be notified when we close.
   AudioManagerMac* const manager_;
@@ skipping 25 matching lines @@
   // The audio device to use with the AUHAL.
   // We can potentially handle both input and output with this device.
   const AudioDeviceID device_;
 
   // The AUHAL Audio Unit which talks to |device_|.
   AudioUnit audio_unit_;
 
   // Volume level from 0 to 1.
   float volume_;
 
-  // Fixed playout hardware latency in frames.
-  double hardware_latency_frames_;
+  // Fixed playout hardware latency.
+  base::TimeDelta hardware_latency_;
 
   // This flag will be set to false while we're actively receiving callbacks.
   bool stopped_;
 
   // Container for retrieving data from AudioSourceCallback::OnMoreData().
   std::unique_ptr<AudioBus> output_bus_;
 
   // Dynamically allocated FIFO used when CoreAudio asks for unexpected frame
   // sizes.
   std::unique_ptr<AudioPullFifo> audio_fifo_;
 
-  // Current buffer delay.  Set by Render().
-  uint32_t current_hardware_pending_bytes_;
+  // Current playout time.  Set by Render().
+  base::TimeTicks current_playout_time_;
 
   // Lost frames not yet reported to the provider. Increased in
   // UpdatePlayoutTimestamp() if any lost frame since last time. Forwarded to
   // the provider and reset in ProvideInput().
   uint32_t current_lost_frames_;
 
   // Stores the timestamp of the previous audio buffer requested by the OS.
   // We use this in combination with |last_number_of_frames_| to detect when
   // the OS has decided to skip rendering frames (i.e. a glitch).
   // This can happen in case of high CPU load or excessive blocking on the
@@ skipping 16 matching lines @@
   // Used to make sure control functions (Start(), Stop() etc) are called on the
   // right thread.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(AUHALStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_MAC_AUDIO_AUHAL_MAC_H_