Switch browser side audio capture path to use base time primitives.

media/audio/pulse/pulse_input.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/pulse/pulse_input.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "media/audio/audio_device_description.h"
 #include "media/audio/pulse/audio_manager_pulse.h"
 #include "media/audio/pulse/pulse_util.h"
+#include "media/base/audio_timestamp_helper.h"
 
 namespace media {
 
 using pulse::AutoPulseLock;
 using pulse::WaitForOperationCompletion;
 
 // Number of blocks of buffers used in the |fifo_|.
 const int kNumberOfBlocksBufferInFifo = 2;
 
 PulseAudioInputStream::PulseAudioInputStream(AudioManagerPulse* audio_manager,
@@ skipping 240 matching lines @@
 
   if (s && stream->callback_ &&
       pa_stream_get_state(s) == PA_STREAM_FAILED) {
     stream->callback_->OnError(stream);
   }
 
   pa_threaded_mainloop_signal(stream->pa_mainloop_, 0);
 }
 
 void PulseAudioInputStream::ReadData() {
-  uint32_t hardware_delay = pulse::GetHardwareLatencyInBytes(
-      handle_, params_.sample_rate(), params_.GetBytesPerFrame());
-
   // Update the AGC volume level once every second. Note that,
   // |volume| is also updated each time SetVolume() is called
   // through IPC by the render-side AGC.
   // We disregard the |normalized_volume| from GetAgcVolume()
   // and use the value calculated by |volume_|.
   double normalized_volume = 0.0;
   GetAgcVolume(&normalized_volume);
   normalized_volume = volume_ / GetMaxVolume();
 
   do {
@@ skipping 16 matching lines @@
     fifo_.Push(data, number_of_frames, params_.bits_per_sample() / 8);
 
     // Checks if we still have data.
     pa_stream_drop(handle_);
   } while (pa_stream_readable_size(handle_) > 0);
 
   while (fifo_.available_blocks()) {
     const AudioBus* audio_bus = fifo_.Consume();
 
     // Compensate the audio delay caused by the FIFO.
-    hardware_delay += fifo_.GetAvailableFrames() * params_.GetBytesPerFrame();
-    callback_->OnData(this, audio_bus, hardware_delay, normalized_volume);
+    base::TimeDelta delay =
+        pulse::GetHardwareLatency(handle_) +
+        AudioTimestampHelper::FramesToTime(fifo_.GetAvailableFrames(),
+                                           params_.sample_rate());
+    base::TimeTicks delay_timestamp = base::TimeTicks::Now();
+    callback_->OnData(this, audio_bus, delay, delay_timestamp,
+                      normalized_volume);
 
     // Sleep 5ms to wait until render consumes the data in order to avoid
     // back to back OnData() method.
     if (fifo_.available_blocks())
       base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(5));
   }
 
   pa_threaded_mainloop_signal(pa_mainloop_, 0);
 }
 
 bool PulseAudioInputStream::GetSourceInformation(pa_source_info_cb_t callback) {
   AutoPulseLock auto_lock(pa_mainloop_);
   if (!handle_)
     return false;
 
   size_t index = pa_stream_get_device_index(handle_);
   pa_operation* operation =
       pa_context_get_source_info_by_index(pa_context_, index, callback, this);
   WaitForOperationCompletion(pa_mainloop_, operation);
   return true;
 }
 
 }  // namespace media