Switch OnMoreData() to use AudioBus.

media/audio/pulse/pulse_output.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/audio/pulse/pulse_output.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/audio_util.h"
@@ skipping 292 matching lines @@
   pa_usec_t pa_latency_micros;
   int negative;
   pa_stream_get_latency(playback_handle_, &pa_latency_micros, &negative);
   uint32 hardware_delay = MicrosecondsToBytes(pa_latency_micros,
                                               sample_rate_,
                                               bytes_per_frame_);
   // TODO(slock): Deal with negative latency (negative == 1).  This has yet
   // to happen in practice though.
   scoped_refptr<media::DataBuffer> packet =
       new media::DataBuffer(packet_size_);
-  size_t packet_size = RunDataCallback(packet->GetWritableData(),
-                                       packet->GetBufferSize(),
-                                       AudioBuffersState(buffer_delay,
-                                                         hardware_delay));
+  int frames_filled = RunDataCallback(
+      audio_bus_.get(), AudioBuffersState(buffer_delay, hardware_delay));
+  size_t packet_size = frames_filled * bytes_per_frame_;
+
+  DCHECK_LE(packet_size, packet_size_);
+  // Note: If this ever changes to output raw float the data must be clipped and
+  // sanitized since it may come from an untrusted source such as NaCl.
+  audio_bus_->ToInterleaved(
+      frames_filled, bytes_per_frame_ / channel_count_,
+      packet->GetWritableData());
 
   if (packet_size == 0)
     return false;
 
   media::AdjustVolume(packet->GetWritableData(),
                       packet_size,
                       channel_count_,
                       bytes_per_frame_ / channel_count_,
                       volume_);
   packet->SetDataSize(packet_size);
@@ skipping 87 matching lines @@
 
   volume_ = static_cast<float>(volume);
 }
 
 void PulseAudioOutputStream::GetVolume(double* volume) {
   DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread());
 
   *volume = volume_;
 }
 
-uint32 PulseAudioOutputStream::RunDataCallback(
-    uint8* dest, uint32 max_size, AudioBuffersState buffers_state) {
+int PulseAudioOutputStream::RunDataCallback(
+    AudioBus* audio_bus, AudioBuffersState buffers_state) {
   if (source_callback_)
-    return source_callback_->OnMoreData(dest, max_size, buffers_state);
+    return source_callback_->OnMoreData(audio_bus, buffers_state);
 
   return 0;
 }
 
 }  // namespace media