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

media/audio/win/audio_unified_win.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/win/audio_unified_win.h"
 
 #include <Functiondiscoverykeys_devpkey.h>
 
 #include "base/debug/trace_event.h"
 #include "base/time.h"
 #include "base/win/scoped_com_initializer.h"
-#include "media/audio/audio_util.h"
 #include "media/audio/win/audio_manager_win.h"
 #include "media/audio/win/avrt_wrapper_win.h"
 #include "media/audio/win/core_audio_util_win.h"
 
 using base::win::ScopedComPtr;
 using base::win::ScopedCOMInitializer;
 using base::win::ScopedCoMem;
 
 // Time in milliseconds between two successive delay measurements.
 // We save resources by not updating the delay estimates for each capture
@@ skipping 499 matching lines @@
           uint8* audio_data = NULL;
           hr = audio_render_client_->GetBuffer(packet_size_frames_,
                                                &audio_data);
           if (FAILED(hr)) {
             DLOG(ERROR) << "Failed to access render buffer";
             continue;
           }
 
           // Convert the audio bus content to interleaved integer data using
           // |audio_data| as destination.
+          render_bus_->Scale(volume_);
           render_bus_->ToInterleaved(
               packet_size_frames_, bytes_per_sample, audio_data);
 
-          // Perform in-place, software-volume adjustments.
-          media::AdjustVolume(audio_data,
-                              frames_filled * format_.Format.nBlockAlign,
-                              render_bus_->channels(),
-                              bytes_per_sample,
-                              volume_);
-
           // Release the buffer space acquired in the GetBuffer() call.
           audio_render_client_->ReleaseBuffer(packet_size_frames_, 0);
           DLOG_IF(ERROR, FAILED(hr)) << "Failed to release render buffer";
         }
         break;
       default:
         error = true;
         break;
     }
   }
@@ skipping 24 matching lines @@
 void WASAPIUnifiedStream::StopAndJoinThread(HRESULT err) {
   CHECK(GetCurrentThreadId() == creating_thread_id_);
   DCHECK(audio_io_thread_.get());
   SetEvent(stop_streaming_event_.Get());
   audio_io_thread_->Join();
   audio_io_thread_.reset();
   HandleError(err);
 }
 
 }  // namespace media