Collapse AudioRendererMixer and OnMoreDataResampler into AudioTransform.

media/base/audio_renderer_mixer_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/base/audio_renderer_mixer_input.h"
 
 #include "base/logging.h"
 #include "media/base/audio_renderer_mixer.h"
 
 namespace media {
 
 AudioRendererMixerInput::AudioRendererMixerInput(
     const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb)
     : playing_(false),
       initialized_(false),
       started_(false),
       volume_(1.0f),
       get_mixer_cb_(get_mixer_cb),
       remove_mixer_cb_(remove_mixer_cb),
       mixer_(NULL),
-      callback_(NULL) {
+      callback_(NULL),
+      current_audio_delay_milliseconds_(0) {

[miu, 2012/11/12 20:51:59]

This new member is never updated anywhere.  Do you still need it?

[DaleCurtis, 2012/11/12 21:23:53]

Set in header file via hacker_style() setter.

 }
 
 AudioRendererMixerInput::~AudioRendererMixerInput() {
   // Mixer is no longer safe to use after |remove_mixer_cb_| has been called.
   if (initialized_)
     remove_mixer_cb_.Run(params_);
 }
 
 void AudioRendererMixerInput::Initialize(
     const AudioParameters& params,
@@ skipping 33 matching lines @@
   // We don't care about flush since Pause() simply indicates we should send
   // silence to AudioRendererMixer.
   playing_ = false;
 }
 
 bool AudioRendererMixerInput::SetVolume(double volume) {
   volume_ = volume;
   return true;
 }
 
-void AudioRendererMixerInput::GetVolume(double* volume) {
-  *volume = volume_;
+float AudioRendererMixerInput::ProvideAudioTransformInput(
+    AudioBus* audio_bus, base::TimeDelta buffer_delay) {
+  int frames_filled = 0;
+
+  if (playing_) {
+    frames_filled = callback_->Render(
+        audio_bus,
+        current_audio_delay_milliseconds_ + buffer_delay.InMilliseconds());

[scherkus (not reviewing), 2012/11/14 22:43:50]

this mixing 'n matching between TimeDelta and integer milliseconds is a bit
whack

[DaleCurtis, 2012/11/16 23:51:05]

Yeah, the end goal is everyone using TimeDelta everywhere, but I'm not
yak-shaving that in this CL.

+
+    // AudioTransform expects unfilled frames to be zeroed.
+    if (frames_filled < audio_bus->frames()) {
+      audio_bus->ZeroFramesPartial(
+          frames_filled, audio_bus->frames() - frames_filled);
+    }
+  }
+
+  return frames_filled > 0 ? volume_ : 0;
+}
+
+void AudioRendererMixerInput::OnRenderError() {
+  callback_->OnRenderError();
 }
 
 }  // namespace media