Skip to content

GitLab

T
tangled
Commit 844a34c2 authored by Raymond Toy's avatar Raymond Toy Committed by Commit Bot
Browse files
Options

Handle k-rate AudioParam inputs for DynamicsCompressorNode 

Support k-rate input to the AudioParms for a DynamicsCompressorNode.
The node only has k-rate AudioParams so we just need to make sure the
input is used.

Manually ran this test on Chrome stable, and all tests fail as
expected since k-rate inputs are not working there.

Bug: 1015760
Test: k-rate-dynamics-compressor-connections.html
Change-Id: I9ddaf27be5f2fef65f394f3d63f1fa8998c0ed82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2145814Reviewed-by: default avatarHongchan Choi <hongchan@chromium.org>
Commit-Queue: Raymond Toy <rtoy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#765309}
parent 16a7ed53
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 5 deletions
third_party/blink/renderer/modules/webaudio/dynamics_compressor_node.cc
View file @ 844a34c2
......@@ -81,11 +81,11 @@ void DynamicsCompressorHandler::Process(uint32_t frames_to_process) {
AudioBus* output_bus = Output(0).Bus();
DCHECK(output_bus);
float threshold = threshold_->Value();
float knee = knee_->Value();
float ratio = ratio_->Value();
float attack = attack_->Value();
float release = release_->Value();
float threshold = threshold_->FinalValue();
float knee = knee_->FinalValue();
float ratio = ratio_->FinalValue();
float attack = attack_->FinalValue();
float release = release_->FinalValue();
dynamics_compressor_->SetParameterValue(DynamicsCompressor::kParamThreshold,
threshold);
......
third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html 0 → 100644
View file @ 844a34c2
<!doctype html>
<html>
<head>
<title>k-rate AudioParams with inputs for DynamicsCompressorNode</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/webaudio/resources/audit.js"></script>
<script src="/webaudio/resources/audit-util.js"></script>
</head>
<body>
<script>
let audit = Audit.createTaskRunner();
// Fairly abitrary sampleRate and somewhat duration
const sampleRate = 48000;
const testDuration = 0.25;
['attack', 'knee', 'ratio', 'release', 'threshold'].forEach(param => {
audit.define(
{label: param, description: `Dynamics compressor ${param}`},
async (task, should) => {
await doTest(should, {prefix: task.label, paramName: param});
task.done();
});
});
audit.run();
async function doTest(should, options) {
// Test k-rate automation of DynamicsCompressorNode with connected
// input.
//
// A reference compressor node is created with an automation on the
// selected AudioParam. For simplicity, we just use a linear ramp from
// the minValue to the maxValue of the AudioParam.
//
// The test node has an input signal connected to the AudioParam. This
// input signal is created to match the automation on the reference
// node.
//
// Finally, the output from the two nodes must be identical if k-rate
// inputs are working correctly.
//
// Options parameter is a dictionary with the following required
// members:
// prefix - prefix to use for the messages.
// paramName - Name of the AudioParam to be tested
let {prefix, paramName} = options;
let context = new OfflineAudioContext({
numberOfChannels: 2,
sampleRate: sampleRate,
length: testDuration * sampleRate
});
let merger = new ChannelMergerNode(
context, {numberOfInputs: context.destination.channelCount});
merger.connect(context.destination);
// Use an oscillator for the source. Pretty arbitrary parameters.
let src =
new OscillatorNode(context, {type: 'sawtooth', frequency: 440});
// Create the reference and test nodes.
let refNode;
let tstNode;
should(
() => refNode = new DynamicsCompressorNode(context),
`${prefix}: refNode = new DynamicsCompressorNode(context)`)
.notThrow();
let tstOptions = {};
tstOptions[paramName] = refNode[paramName].minValue;
should(
() => tstNode = new DynamicsCompressorNode(context, tstOptions),
`${prefix}: tstNode = new DynamicsCompressorNode(context, ${
JSON.stringify(tstOptions)})`)
.notThrow();
// Automate the AudioParam of the reference node with a linear ramp
should(
() => refNode[paramName].setValueAtTime(
refNode[paramName].minValue, 0),
`${prefix}: refNode[${paramName}].setValueAtTime(refNode[${
paramName}].minValue, 0)`)
.notThrow();
should(
() => refNode[paramName].linearRampToValueAtTime(
refNode[paramName].maxValue, testDuration),
`${prefix}: refNode[${paramName}].linearRampToValueAtTime(refNode[${
paramName}].minValue, ${testDuration})`)
.notThrow();
// Create the input node and automate it so that it's output when added
// to the intrinsic value of the AudioParam we get the same values as
// the automations on the ference node. We need to do it this way
// because the ratio AudioParam has a nominal range of [1, 20] so we
// can't just set the value to 0, which is what we'd normally do.
let mod;
should(
() => mod = new ConstantSourceNode(context, {offset: 0}),
`${prefix}: mod = new ConstantSourceNode(context, {offset: 0})`)
.notThrow();
let endValue =
refNode[paramName].maxValue - refNode[paramName].minValue;
should(
() => mod.offset.setValueAtTime(0, 0),
`${prefix}: mod.offset.setValueAtTime(0, 0)`)
.notThrow();
should(
() => mod.offset.linearRampToValueAtTime(endValue, testDuration),
`${prefix}: mod.offset.linearRampToValueAtTime(${endValue}, ${
testDuration})`)
.notThrow();
// Connect up everything.
should(
() => mod.connect(tstNode[paramName]),
`${prefix}: mod.connect(tstNode[${paramName}])`)
.notThrow();
src.connect(refNode).connect(merger, 0, 0);
src.connect(tstNode).connect(merger, 0, 1);
// Go!
src.start();
mod.start();
const buffer = await context.startRendering();
let expected = buffer.getChannelData(0);
let actual = buffer.getChannelData(1);
// The expected and actual results must be EXACTLY the same.
should(actual, `k-rate ${paramName} AudioParam with input`)
.beCloseToArray(expected, {absoluteThreshold: 0});
}
</script>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment