Switch AudioRenderSink::Callback to use AudioBus.

media/audio/audio_util.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.
 
 // Software adjust volume of samples, allows each audio stream its own
 // volume without impacting master volume for chrome and other applications.
 
 // Implemented as templates to allow 8, 16 and 32 bit implementations.
 // 8 bit is unsigned and biased by 128.
 
 // TODO(vrk): This file has been running pretty wild and free, and it's likely
 // that a lot of the functions can be simplified and made more elegant. Revisit
 // after other audio cleanup is done. (crbug.com/120319)
 
 #include <algorithm>
 #include <limits>
 
 #include "base/atomicops.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/shared_memory.h"
 #include "base/time.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/audio_util.h"
+#include "media/base/audio_bus.h"
 
 #if defined(OS_MACOSX)
 #include "media/audio/mac/audio_low_latency_input_mac.h"
 #include "media/audio/mac/audio_low_latency_output_mac.h"
 #elif defined(OS_WIN)
 #include "base/command_line.h"
 #include "base/win/windows_version.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/win/audio_low_latency_input_win.h"
 #include "media/audio/win/audio_low_latency_output_win.h"
@@ skipping 188 matching lines @@
 
     default:
      break;
   }
   return false;
 }
 
 // |Format| is the destination type, |Fixed| is a type larger than |Format|
 // such that operations can be made without overflowing.
 template<class Format, class Fixed>
-static void InterleaveFloatToInt(const std::vector<float*>& source,
+static void InterleaveFloatToInt(const AudioBus* source,
                                  void* dst_bytes, size_t number_of_frames) {
   Format* destination = reinterpret_cast<Format*>(dst_bytes);
   Fixed max_value = std::numeric_limits<Format>::max();
   Fixed min_value = std::numeric_limits<Format>::min();
 
   Format bias = 0;
   if (!std::numeric_limits<Format>::is_signed) {
     bias = max_value / 2;
     max_value = bias;
     min_value = -(bias - 1);
   }
 
-  int channels = source.size();
+  int channels = source->channels();
   for (int i = 0; i < channels; ++i) {
-    float* channel_data = source[i];
+    const float* channel_data = source->channel(i);
     for (size_t j = 0; j < number_of_frames; ++j) {
       Fixed sample = max_value * channel_data[j];
       if (sample > max_value)
         sample = max_value;
       else if (sample < min_value)
         sample = min_value;
 
       destination[j * channels + i] = static_cast<Format>(sample) + bias;
     }
   }
 }
 
-void InterleaveFloatToInt(const std::vector<float*>& source, void* dst,
+void InterleaveFloatToInt(const AudioBus* source, void* dst,
                           size_t number_of_frames, int bytes_per_sample) {
   switch (bytes_per_sample) {
     case 1:
       InterleaveFloatToInt<uint8, int32>(source, dst, number_of_frames);
       break;
     case 2:
       InterleaveFloatToInt<int16, int32>(source, dst, number_of_frames);
       break;
     case 4:
       InterleaveFloatToInt<int32, int64>(source, dst, number_of_frames);
@@ skipping 274 matching lines @@
   //    out performance was degraded compared to XP.
   //  - The regression was fixed in Windows 7 and most configurations will work
   //    with 2, but some (e.g., some Sound Blasters) still need 3.
   //  - Some XP configurations (even multi-processor ones) also need 3.
   return (base::win::GetVersion() == base::win::VERSION_VISTA) ? 4 : 3;
 }
 
 #endif
 
 }  // namespace media