Express audio delay more precisely in frames rather than milliseconds.

media/base/audio_renderer_mixer.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/base/audio_renderer_mixer.h"
 
+#include <cmath>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 
 namespace media {
 
 enum { kPauseDelaySeconds = 10 };
 
 AudioRendererMixer::AudioRendererMixer(
     const AudioParameters& output_params,
@@ skipping 93 matching lines @@
   NOTREACHED();
 }
 
 OutputDevice* AudioRendererMixer::GetOutputDevice() {
   DVLOG(1) << __FUNCTION__;
   base::AutoLock auto_lock(lock_);
   return audio_sink_->GetOutputDevice();
 }
 
 int AudioRendererMixer::Render(AudioBus* audio_bus,
-                               uint32_t audio_delay_milliseconds,
+                               uint32_t frames_delayed,
                                uint32_t frames_skipped) {
   base::AutoLock auto_lock(lock_);
 
   // If there are no mixer inputs and we haven't seen one for a while, pause the
   // sink to avoid wasting resources when media elements are present but remain
   // in the pause state.
   const base::TimeTicks now = base::TimeTicks::Now();
   if (!master_converter_.empty()) {
     last_play_time_ = now;
   } else if (now - last_play_time_ >= pause_delay_ && playing_) {
     audio_sink_->Pause();
     playing_ = false;
   }
 
-  master_converter_.ConvertWithDelay(
-      base::TimeDelta::FromMilliseconds(audio_delay_milliseconds), audio_bus);
+  // TODO(chcunningham): Delete this conversion and change ConvertWith delay to
+  // expect a count of frames delayed instead of TimeDelta (less precise).

[Henrik Grunell, 2016/02/17 08:13:47]

Did you have a bug for this?

[chcunningham, 2016/02/17 18:32:37]

Done. http://crbug.com/587522. Updated the comment

+  base::TimeDelta audio_delay = base::TimeDelta::FromMicroseconds(
+      std::round(frames_delayed * output_params_.GetMicrosecondsPerFrame()));
+
+  master_converter_.ConvertWithDelay(audio_delay, audio_bus);
   return audio_bus->frames();
 }
 
 void AudioRendererMixer::OnRenderError() {
   // Call each mixer input and signal an error.
   base::AutoLock auto_lock(lock_);
   for (const auto& cb : error_callbacks_)
     cb.Run();
 }
 
 }  // namespace media