Index: media/audio/win/audio_low_latency_output_win.cc |
diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc |
index b5a4c47da353c1fb9a8e35b1f22a7baa5fdb826f..04b5dd23721d50d9b5b1be3cfe223fc218003fc8 100644 |
--- a/media/audio/win/audio_low_latency_output_win.cc |
+++ b/media/audio/win/audio_low_latency_output_win.cc |
@@ -13,7 +13,6 @@ |
#include "base/metrics/histogram.h" |
#include "base/utf_string_conversions.h" |
#include "base/win/scoped_propvariant.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" |
@@ -581,15 +580,10 @@ void WASAPIAudioOutputStream::RenderAudioFromSource( |
// clipped and sanitized since it may come from an untrusted |
// source such as NaCl. |
const int bytes_per_sample = format_.Format.wBitsPerSample >> 3; |
+ audio_bus_->Scale(volume_); |
audio_bus_->ToInterleaved( |
frames_filled, bytes_per_sample, audio_data); |
- // Perform in-place, software-volume adjustments. |
- media::AdjustVolume(audio_data, |
- num_filled_bytes, |
- audio_bus_->channels(), |
- bytes_per_sample, |
- volume_); |
// Release the buffer space acquired in the GetBuffer() call. |
// Render silence if we were not able to fill up the buffer totally. |