Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Unified Diff: media/audio/linux/alsa_output.cc

Issue 13726011: Add vector_math::FMUL. Replace audio_util::AdjustVolume. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix volume == 1 case. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_util_unittest.cc ('k') | media/audio/mac/audio_auhal_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « media/audio/audio_util_unittest.cc ('k') | media/audio/mac/audio_auhal_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698