Add vector_math::FMUL. Replace audio_util::AdjustVolume.

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"
 
 namespace media {
 
 OpenSLESOutputStream::OpenSLESOutputStream(AudioManagerAndroid* manager,
                                            const AudioParameters& params)
     : audio_manager_(manager),
       callback_(NULL),
       player_(NULL),
       simple_buffer_queue_(NULL),
@@ skipping 241 matching lines @@
   uint32 hardware_delay = buffer_size_bytes_;
   int frames_filled = callback_->OnMoreData(
       audio_bus_.get(), AudioBuffersState(0, hardware_delay));
   if (frames_filled <= 0)
     return;  // Audio source is shutting down, or halted on error.
   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_->Scale(volume_);
   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_.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);
 
   active_queue_ = (active_queue_  + 1) % kNumOfQueuesInBuffer;
 }
@@ skipping 14 matching lines @@
   }
 }
 
 void OpenSLESOutputStream::HandleError(SLresult error) {
   DLOG(ERROR) << "OpenSLES error " << error;
   if (callback_)
     callback_->OnError(this);
 }
 
 }  // namespace media