Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/win/waveout_output_win.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/win/waveout_output_win.h"
 
 #include "base/atomicops.h"
 #include "base/logging.h"
+#include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/win/audio_manager_win.h"
 
 namespace media {
 
 // Some general thoughts about the waveOut API which is badly documented :
 // - We use CALLBACK_EVENT mode in which XP signals events such as buffer
 //   releases.
 // - We use RegisterWaitForSingleObject() so one of threads in thread pool
@@ skipping 296 matching lines @@
   if (callback_)
     callback_->OnError(this);
 }
 
 void PCMWaveOutAudioOutputStream::QueueNextPacket(WAVEHDR *buffer) {
   DCHECK_EQ(channels_, format_.Format.nChannels);
   // Call the source which will fill our buffer with pleasant sounds and
   // return to us how many bytes were used.
   // TODO(fbarchard): Handle used 0 by queueing more.
 
-  // TODO(sergeyu): Specify correct hardware delay for |total_delay_bytes|.
-  uint32_t total_delay_bytes = pending_bytes_;
+  // TODO(sergeyu): Specify correct hardware delay for |delay|.
+  const base::TimeDelta delay = base::TimeDelta::FromMicroseconds(
+      pending_bytes_ * base::Time::kMicrosecondsPerSecond /

[chcunningham, 2016/09/23 20:53:30]

int division

[jameswest, 2016/09/29 00:52:24]

As discussed, this integer division is safe.

+      format_.Format.nAvgBytesPerSec);
   int frames_filled =
-      callback_->OnMoreData(audio_bus_.get(), total_delay_bytes, 0);
+      callback_->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus_.get());
   uint32_t used = frames_filled * audio_bus_->channels() *
                   format_.Format.wBitsPerSample / 8;
 
   if (used <= buffer_size_) {
     // 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_);
     audio_bus_->ToInterleaved(
         frames_filled, format_.Format.wBitsPerSample / 8, buffer->lpData);
 
@@ skipping 46 matching lines @@
                                        buffer,
                                        sizeof(WAVEHDR));
       if (result != MMSYSERR_NOERROR)
         stream->HandleError(result);
       stream->pending_bytes_ += buffer->dwBufferLength;
     }
   }
 }
 
 }  // namespace media