Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/pulse/pulse_output.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_output.h"
 
 #include <pulse/pulseaudio.h>
 #include <stdint.h>
 
 #include "base/single_thread_task_runner.h"
+#include "base/time/time.h"
 #include "media/audio/audio_device_description.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/pulse/pulse_util.h"
 
 namespace media {
 
 using pulse::AutoPulseLock;
 using pulse::WaitForOperationCompletion;
 
 // static, pa_stream_notify_cb
@@ skipping 104 matching lines @@
     size_t bytes_to_fill = params_.GetBytesPerBuffer();
     CHECK_GE(pa_stream_begin_write(pa_stream_, &buffer, &bytes_to_fill), 0);
     CHECK_EQ(bytes_to_fill, static_cast<size_t>(params_.GetBytesPerBuffer()));
 
     // NOTE: |bytes_to_fill| may be larger than |requested_bytes| now, this is
     // okay since pa_stream_begin_write() is the authoritative source on how
     // much can be written.
 
     int frames_filled = 0;
     if (source_callback_) {
-      const uint32_t hardware_delay = pulse::GetHardwareLatencyInBytes(
-          pa_stream_, params_.sample_rate(), params_.GetBytesPerFrame());
-      frames_filled =
-          source_callback_->OnMoreData(audio_bus_.get(), hardware_delay, 0);
+      const base::TimeDelta delay = pulse::GetHardwareLatency(pa_stream_);
+      frames_filled = source_callback_->OnMoreData(
+          delay, base::TimeTicks::Now(), 0, audio_bus_.get());
 
       // Zero any unfilled data so it plays back as silence.
       if (frames_filled < audio_bus_->frames()) {
         audio_bus_->ZeroFramesPartial(
             frames_filled, audio_bus_->frames() - frames_filled);
       }
 
       // Note: If this ever changes to output raw float the data must be clipped
       // and sanitized since it may come from an untrusted source such as NaCl.
       audio_bus_->Scale(volume_);
@@ skipping 81 matching lines @@
   volume_ = static_cast<float>(volume);
 }
 
 void PulseAudioOutputStream::GetVolume(double* volume) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   *volume = volume_;
 }
 
 }  // namespace media