Collapse AudioRendererMixer and OnMoreDataResampler into AudioTransform.

media/base/audio_pull_fifo.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_AUDIO_PULL_FIFO_H_
 #define MEDIA_BASE_AUDIO_PULL_FIFO_H_
 
 #include "base/callback.h"
 #include "media/base/audio_fifo.h"
 #include "media/base/media_export.h"
@@ skipping 21 matching lines @@
 
   // Consumes |frames_to_consume| audio frames from the FIFO and copies
   // them to |destination|. If the FIFO does not have enough data, we ask
   // the producer to give us more data to fulfill the request using the
   // ReadCB implementation.
   void Consume(AudioBus* destination, int frames_to_consume);
 
   // Empties the FIFO without deallocating any memory.
   void Clear();
 
+  // 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_; }
+
  private:
   // Attempt to fulfill the request using what is available in the FIFO.
   // Append new data to the |destination| starting at |write_pos|.
   void ReadFromFifo(
       AudioBus* destination, int* frames_to_provide, int* write_pos);
 
   // Source of data to the FIFO.
   ReadCB read_cb_;
 
   // The actual FIFO.
   scoped_ptr<AudioFifo> fifo_;
 
   // Temporary audio bus to hold the data from the producer.
   scoped_ptr<AudioBus> bus_;
 
+  int output_frames_ready_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioPullFifo);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_PULL_FIFO_H_