Index: media/audio/linux/alsa_output.cc |
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc |
index ea3d1b665dde9e1f5bfc695d2239fa06126cae45..4615d012e0e7d558033c99f06682c58d78cb110f 100644 |
--- a/media/audio/linux/alsa_output.cc |
+++ b/media/audio/linux/alsa_output.cc |
@@ -42,7 +42,6 @@ |
#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" |
@@ -379,15 +378,10 @@ void AlsaPcmOutputStream::BufferPacket(bool* source_exhausted) { |
// 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. |