Switch OnMoreData() to use AudioBus.

media/audio/android/opensles_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/android/opensles_output.h"
 
 #include "base/logging.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/android/audio_manager_android.h"
 
@@ skipping 17 matching lines @@
   format_.containerSize = params.bits_per_sample();
   format_.endianness = SL_BYTEORDER_LITTLEENDIAN;
   if (format_.numChannels == 1)
     format_.channelMask = SL_SPEAKER_FRONT_CENTER;
   else if (format_.numChannels == 2)
     format_.channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT;
   else
     NOTREACHED() << "Unsupported number of channels: " << format_.numChannels;
 
   buffer_size_bytes_ = params.GetBytesPerBuffer();
+  audio_bus_ = AudioBus::Create(params);
 
   memset(&audio_data_, 0, sizeof(audio_data_));
 }
 
 OpenSLESOutputStream::~OpenSLESOutputStream() {
   DCHECK(!engine_object_.Get());
   DCHECK(!player_object_.Get());
   DCHECK(!output_mixer_.Get());
   DCHECK(!player_);
   DCHECK(!simple_buffer_queue_);
@@ skipping 202 matching lines @@
   stream->FillBufferQueue();
 }
 
 void OpenSLESOutputStream::FillBufferQueue() {
   if (!started_)
     return;
 
   // Read data from the registered client source.
   // TODO(xians): Get an accurate delay estimation.
   uint32 hardware_delay = buffer_size_bytes_;
-  size_t num_filled_bytes = callback_->OnMoreData(
-      audio_data_[active_queue_],
-      buffer_size_bytes_,
-      AudioBuffersState(0, hardware_delay));
-  DCHECK(num_filled_bytes <= buffer_size_bytes_);
+  int frames_filled = callback_->OnMoreData(
+      audio_bus_.get(), AudioBuffersState(0, hardware_delay));
+  int num_filled_bytes =
+      frames_filled * audio_bus_->channels() * format_.bitsPerSample / 8;
+  DCHECK_LE(static_cast<size_t>(num_filled_bytes), buffer_size_bytes_);
+  // 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, format_.bitsPerSample / 8, audio_data_[active_queue_]);
 
   // Perform in-place, software-volume adjustments.
   media::AdjustVolume(audio_data_[active_queue_],
                       num_filled_bytes,
                       format_.numChannels,
-                      format_.containerSize >> 3,
+                      format_.bitsPerSample / 8,
                       volume_);
 
   // Enqueue the buffer for playback.
   SLresult err = (*simple_buffer_queue_)->Enqueue(
       simple_buffer_queue_,
       audio_data_[active_queue_],
       num_filled_bytes);
   if (SL_RESULT_SUCCESS != err)
     HandleError(err);
 
@@ skipping 16 matching lines @@
   }
 }
 
 void OpenSLESOutputStream::HandleError(SLresult error) {
   DLOG(FATAL) << "OpenSLES error " << error;
   if (callback_)
     callback_->OnError(this, error);
 }
 
 }  // namespace media