Merge 171701

media/audio/mac/audio_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.
 
 #ifndef MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_
 #define MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_
 
 #include <AudioToolbox/AudioQueue.h>
 #include <AudioToolbox/AudioFormat.h>
 
 #include "base/compiler_specific.h"
+#include "base/time.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
 namespace media {
 
 class AudioManagerBase;
 
 // Implementation of AudioInputStream for Mac OS X using the audio queue service
 // present in OS 10.5 and later. Design reflects PCMQueueOutAudioOutputStream.
 class PCMQueueInAudioInputStream : public AudioInputStream {
@@ skipping 33 matching lines @@
       UInt32 num_packets,
       const AudioStreamPacketDescription* desc);
 
   // Handles callback from OS. Will be called on OS internal thread.
   void HandleInputBuffer(AudioQueueRef audio_queue,
                          AudioQueueBufferRef audio_buffer,
                          const AudioTimeStamp* start_time,
                          UInt32 num_packets,
                          const AudioStreamPacketDescription* packet_desc);
 
-  static const int kNumberBuffers = 1;
+  static const int kNumberBuffers = 3;
 
   // Manager that owns this stream, used for closing down.
   AudioManagerBase* manager_;
   // We use the callback mostly to periodically supply the recorded audio data.
   AudioInputCallback* callback_;
   // Structure that holds the stream format details such as bitrate.
   AudioStreamBasicDescription format_;
   // Handle to the OS audio queue object.
   AudioQueueRef audio_queue_;
   // Size of each of the buffers in |audio_buffers_|
   uint32 buffer_size_bytes_;
   // True iff Start() has been called successfully.
   bool started_;
+  // Used to determine if we need to slow down |callback_| calls.
+  base::Time last_fill_;
 
   DISALLOW_COPY_AND_ASSIGN(PCMQueueInAudioInputStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_MAC_AUDIO_INPUT_MAC_H_