Index: media/base/audio_renderer_mixer_input.cc |
diff --git a/media/base/audio_renderer_mixer_input.cc b/media/base/audio_renderer_mixer_input.cc |
index 2c476f0109c55805de8714a0e614a16fdc9815f3..d52774b5cc6e37559fe69cd1cc54bb90a8f74643 100644 |
--- a/media/base/audio_renderer_mixer_input.cc |
+++ b/media/base/audio_renderer_mixer_input.cc |
@@ -4,6 +4,7 @@ |
#include "media/base/audio_renderer_mixer_input.h" |
+#include "base/bind.h" |
#include "base/logging.h" |
#include "media/base/audio_renderer_mixer.h" |
@@ -18,7 +19,8 @@ AudioRendererMixerInput::AudioRendererMixerInput( |
remove_mixer_cb_(remove_mixer_cb), |
mixer_(NULL), |
callback_(NULL), |
- current_audio_delay_milliseconds_(0) { |
+ error_cb_(base::Bind( |
+ &AudioRendererMixerInput::OnRenderError, base::Unretained(this))) { |
} |
AudioRendererMixerInput::~AudioRendererMixerInput() { |
@@ -58,7 +60,7 @@ void AudioRendererMixerInput::Play() { |
if (playing_) |
return; |
- mixer_->AddMixerInput(this); |
+ mixer_->AddMixerInput(this, error_cb_); |
playing_ = true; |
} |
@@ -80,8 +82,7 @@ bool AudioRendererMixerInput::SetVolume(double volume) { |
double AudioRendererMixerInput::ProvideInput(AudioBus* audio_bus, |
base::TimeDelta buffer_delay) { |
int frames_filled = callback_->Render( |
- audio_bus, |
- current_audio_delay_milliseconds_ + buffer_delay.InMilliseconds()); |
+ audio_bus, buffer_delay.InMillisecondsF() + 0.5); |
no longer working on chromium
2013/04/30 08:42:23
nit, this might trigger compiling warning, explici
|
// AudioConverter expects unfilled frames to be zeroed. |
if (frames_filled < audio_bus->frames()) { |