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

media/audio/linux/alsa_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.
 //
 // THREAD SAFETY
 //
 // AlsaPcmOutputStream object is *not* thread-safe and should only be used
 // from the audio thread.  We DCHECK on this assumption whenever we can.
 //
 // SEMANTICS OF Close()
@@ skipping 24 matching lines @@
 #include "media/audio/linux/alsa_output.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/time.h"
-#include "media/audio/audio_util.h"
 #include "media/audio/linux/alsa_util.h"
 #include "media/audio/linux/alsa_wrapper.h"
 #include "media/audio/linux/audio_manager_linux.h"
 #include "media/base/channel_mixer.h"
 #include "media/base/data_buffer.h"
 #include "media/base/seekable_buffer.h"
 
 namespace media {
 
 // Set to 0 during debugging if you want error messages due to underrun
@@ skipping 316 matching lines @@
     AudioBus* output_bus = audio_bus_.get();
     if (channel_mixer_) {
       output_bus = mixed_audio_bus_.get();
       channel_mixer_->Transform(audio_bus_.get(), output_bus);
       // Adjust packet size for downmix.
       packet_size = packet_size / bytes_per_frame_ * bytes_per_output_frame_;
     }
 
     // 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.
+    output_bus->Scale(volume_);
     output_bus->ToInterleaved(
         frames_filled, bytes_per_sample_, packet->GetWritableData());
 
-    media::AdjustVolume(packet->GetWritableData(),
-                        packet_size,
-                        output_bus->channels(),
-                        bytes_per_sample_,
-                        volume_);
-
     if (packet_size > 0) {
       packet->SetDataSize(packet_size);
       // Add the packet to the buffer.
       buffer_->Append(packet);
     } else {
       *source_exhausted = true;
     }
   }
 }
 
@@ skipping 363 matching lines @@
 }
 
 // Changes the AudioSourceCallback to proxy calls to.  Pass in NULL to
 // release ownership of the currently registered callback.
 void AlsaPcmOutputStream::set_source_callback(AudioSourceCallback* callback) {
   DCHECK(IsOnAudioThread());
   source_callback_ = callback;
 }
 
 }  // namespace media