| Index: third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp
|
| index 4be5421fcdf14140101819b2bbd3c082814805dc..ce43aebbc69391b075346c8bcb5f6be9041e27e8 100644
|
| --- a/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp
|
| +++ b/third_party/WebKit/Source/modules/webaudio/DynamicsCompressorNode.cpp
|
| @@ -33,15 +33,18 @@ static const unsigned defaultNumberOfOutputChannels = 2;
|
| namespace blink {
|
|
|
| DynamicsCompressorHandler::DynamicsCompressorHandler(
|
| - AudioNode& node, float sampleRate,
|
| - AudioParamHandler& threshold, AudioParamHandler& knee,
|
| - AudioParamHandler& ratio, AudioParamHandler& reduction,
|
| - AudioParamHandler& attack, AudioParamHandler& release)
|
| + AudioNode& node,
|
| + float sampleRate,
|
| + AudioParamHandler& threshold,
|
| + AudioParamHandler& knee,
|
| + AudioParamHandler& ratio,
|
| + AudioParamHandler& attack,
|
| + AudioParamHandler& release)
|
| : AudioHandler(NodeTypeDynamicsCompressor, node, sampleRate)
|
| , m_threshold(threshold)
|
| , m_knee(knee)
|
| , m_ratio(ratio)
|
| - , m_reduction(reduction)
|
| + , m_reduction(0)
|
| , m_attack(attack)
|
| , m_release(release)
|
| {
|
| @@ -51,12 +54,22 @@ DynamicsCompressorHandler::DynamicsCompressorHandler(
|
| }
|
|
|
| PassRefPtr<DynamicsCompressorHandler> DynamicsCompressorHandler::create(
|
| - AudioNode& node, float sampleRate,
|
| - AudioParamHandler& threshold, AudioParamHandler& knee,
|
| - AudioParamHandler& ratio, AudioParamHandler& reduction,
|
| - AudioParamHandler& attack, AudioParamHandler& release)
|
| -{
|
| - return adoptRef(new DynamicsCompressorHandler(node, sampleRate, threshold, knee, ratio, reduction, attack, release));
|
| + AudioNode& node,
|
| + float sampleRate,
|
| + AudioParamHandler& threshold,
|
| + AudioParamHandler& knee,
|
| + AudioParamHandler& ratio,
|
| + AudioParamHandler& attack,
|
| + AudioParamHandler& release)
|
| +{
|
| + return adoptRef(new DynamicsCompressorHandler(
|
| + node,
|
| + sampleRate,
|
| + threshold,
|
| + knee,
|
| + ratio,
|
| + attack,
|
| + release));
|
| }
|
|
|
| DynamicsCompressorHandler::~DynamicsCompressorHandler()
|
| @@ -83,8 +96,7 @@ void DynamicsCompressorHandler::process(size_t framesToProcess)
|
|
|
| m_dynamicsCompressor->process(input(0).bus(), outputBus, framesToProcess);
|
|
|
| - float reduction = m_dynamicsCompressor->parameterValue(DynamicsCompressor::ParamReduction);
|
| - m_reduction->setValue(reduction);
|
| + m_reduction = m_dynamicsCompressor->parameterValue(DynamicsCompressor::ParamReduction);
|
| }
|
|
|
| void DynamicsCompressorHandler::initialize()
|
| @@ -98,7 +110,7 @@ void DynamicsCompressorHandler::initialize()
|
|
|
| void DynamicsCompressorHandler::clearInternalStateWhenDisabled()
|
| {
|
| - m_reduction->setValue(0);
|
| + m_reduction = 0;
|
| }
|
|
|
| double DynamicsCompressorHandler::tailTime() const
|
| @@ -118,11 +130,17 @@ DynamicsCompressorNode::DynamicsCompressorNode(AbstractAudioContext& context, fl
|
| , m_threshold(AudioParam::create(context, -24))
|
| , m_knee(AudioParam::create(context, 30))
|
| , m_ratio(AudioParam::create(context, 12))
|
| - , m_reduction(AudioParam::create(context, 0))
|
| , m_attack(AudioParam::create(context, 0.003))
|
| , m_release(AudioParam::create(context, 0.250))
|
| {
|
| - setHandler(DynamicsCompressorHandler::create(*this, sampleRate, m_threshold->handler(), m_knee->handler(), m_ratio->handler(), m_reduction->handler(), m_attack->handler(), m_release->handler()));
|
| + setHandler(DynamicsCompressorHandler::create(
|
| + *this,
|
| + sampleRate,
|
| + m_threshold->handler(),
|
| + m_knee->handler(),
|
| + m_ratio->handler(),
|
| + m_attack->handler(),
|
| + m_release->handler()));
|
| }
|
|
|
| DynamicsCompressorNode* DynamicsCompressorNode::create(AbstractAudioContext& context, float sampleRate)
|
| @@ -135,7 +153,6 @@ DEFINE_TRACE(DynamicsCompressorNode)
|
| visitor->trace(m_threshold);
|
| visitor->trace(m_knee);
|
| visitor->trace(m_ratio);
|
| - visitor->trace(m_reduction);
|
| visitor->trace(m_attack);
|
| visitor->trace(m_release);
|
| AudioNode::trace(visitor);
|
| @@ -161,9 +178,9 @@ AudioParam* DynamicsCompressorNode::ratio() const
|
| return m_ratio;
|
| }
|
|
|
| -AudioParam* DynamicsCompressorNode::reduction() const
|
| +float DynamicsCompressorNode::reduction() const
|
| {
|
| - return m_reduction;
|
| + return dynamicsCompressorHandler().reductionValue();
|
| }
|
|
|
| AudioParam* DynamicsCompressorNode::attack() const
|
|
|