Collapse AudioRendererMixer and OnMoreDataResampler into AudioTransform.

media/base/multi_channel_resampler.h

 // 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.
 
 #ifndef MEDIA_BASE_MULTI_CHANNEL_RESAMPLER_H_
 #define MEDIA_BASE_MULTI_CHANNEL_RESAMPLER_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 19 matching lines @@
   MultiChannelResampler(int channels, double io_sample_rate_ratio,
                         const ReadCB& read_cb);
   virtual ~MultiChannelResampler();
 
   // Resamples |frames| of data from |read_cb_| into AudioBus.
   void Resample(AudioBus* audio_bus, int frames);
 
   // Flush all buffered data and reset internal indices.
   void Flush();
 
+  // Number of output frames already processed.  Can be called by ReadCB to
+  // determine the current audio delay due to buffering.
+  int output_frames_ready() { return output_frames_ready_; }

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

This appears to be monotonically increasing.  The word "ready" makes it sound
like some kind of temporary "what's currently available" thing.  Perhaps the
naming could be changed to something like output_frames_processed() or even
cumulative_output_frames_processed()?

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

It is not monotonically increasing. It is reset to 0 on each Resample() call.

+
  private:
   // SincResampler::ReadCB implementation.  ProvideInput() will be called for
   // each channel (in channel order) as SincResampler needs more data.
   void ProvideInput(int channel, float* destination, int frames);
 
   // Sanity check to ensure that ProvideInput() retrieves the same number of
   // frames for every channel.
   int last_frame_count_;
 
   // Source of data for resampling.
   ReadCB read_cb_;
 
   // Each channel has its own high quality resampler.
   ScopedVector<SincResampler> resamplers_;
 
   // Buffers for audio data going into SincResampler from ReadCB.
   scoped_ptr<AudioBus> resampler_audio_bus_;
   scoped_ptr<AudioBus> wrapped_resampler_audio_bus_;
   std::vector<float*> resampler_audio_data_;
+
+  // The number of output frames that have successfully been processed during
+  // the current Resample() call.
+  int output_frames_ready_;
 };

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

missing DISALLOW_...

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

Done.

 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MULTI_CHANNEL_RESAMPLER_H_