Second layer of mixing for audio elements.

media/base/loopback_audio_converter.cc

Index: media/base/loopback_audio_converter.cc
diff --git a/media/base/bit_reader.cc b/media/base/loopback_audio_converter.cc
similarity index 28%
copy from media/base/bit_reader.cc
copy to media/base/loopback_audio_converter.cc
index c0d30d66fdd5d0deca5f446b25bd7e812cfbbd46..0ae3df1d8cce443a1b6e259b8134ef13509e4119 100644
--- a/media/base/bit_reader.cc
+++ b/media/base/loopback_audio_converter.cc
@@ -2,33 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/bit_reader.h"
+#include "media/base/loopback_audio_converter.h"
 
 namespace media {
 
-BitReader::BitReader(const uint8* data, int size)
-    : initial_size_(size),
-      data_(data),
-      bytes_left_(size),
-      bit_reader_core_(this) {
-  DCHECK(data != NULL);
-  DCHECK_GE(size, 0);
-}
-
-BitReader::~BitReader() {}
-
-int BitReader::GetBytes(int max_nbytes, const uint8** out) {
-  DCHECK_GE(max_nbytes, 0);
-  DCHECK(out);
+LoopbackAudioConverter::LoopbackAudioConverter(
+    const AudioParameters& input_params,
+    const AudioParameters& output_params,
+    bool disable_fifo)
+    : audio_converter_(input_params, output_params, disable_fifo) {}
 
-  int nbytes = max_nbytes;
-  if (nbytes > bytes_left_)
-    nbytes = bytes_left_;
+LoopbackAudioConverter::~LoopbackAudioConverter() {}
 
-  *out = data_;
-  data_ += nbytes;
-  bytes_left_ -= nbytes;
-  return nbytes;
+double LoopbackAudioConverter::ProvideInput(AudioBus* audio_bus,
+                                            base::TimeDelta buffer_delay) {
+  audio_converter_.ConvertWithDelay(buffer_delay, audio_bus);
+  return 1.0;
 }
 
 }  // namespace media