summaryrefslogtreecommitdiffstats
path: root/WebCore/webaudio/AudioBufferSourceNode.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-05 14:36:32 +0100
committerBen Murdoch <benm@google.com>2011-05-10 15:38:30 +0100
commitf05b935882198ccf7d81675736e3aeb089c5113a (patch)
tree4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/webaudio/AudioBufferSourceNode.cpp
parent60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff)
downloadexternal_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip
external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz
external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/webaudio/AudioBufferSourceNode.cpp')
-rw-r--r--WebCore/webaudio/AudioBufferSourceNode.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/webaudio/AudioBufferSourceNode.cpp b/WebCore/webaudio/AudioBufferSourceNode.cpp
index 7aaeb04..05abed8 100644
--- a/WebCore/webaudio/AudioBufferSourceNode.cpp
+++ b/WebCore/webaudio/AudioBufferSourceNode.cpp
@@ -31,6 +31,7 @@
#include "AudioContext.h"
#include "AudioNodeOutput.h"
#include <algorithm>
+#include <wtf/MathExtras.h>
using namespace std;
@@ -324,7 +325,7 @@ void AudioBufferSourceNode::readFromBufferWithGrainEnvelope(float* sourceL, floa
m_grainFrameCount++;
x = min(1.0f, x);
- float grainEnvelope = sinf(M_PI * x);
+ float grainEnvelope = sinf(piFloat * x);
*destinationL++ = grainEnvelope * *sourceL++;