Skip to content

GitLab

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

Update current_frame 

When a setTargetAtTime event has converged (10 time constants), we
basically hold the value.  However, if there's a setValue event after
convergence, and this setValue is within the current render quantum,
the current_frame was not getting updated, so when this event and the
next are getting processed, the currentTime has the incorrect value.

Update current_frame appropriately in this case.

Bug: 990393
Test: the-audioparam-interface/set-target-conv.html
Change-Id: I4b364d3972e1f5acb454916fdb6455fb75b7e7b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1736173Reviewed-by: default avatarHongchan Choi <hongchan@chromium.org>
Commit-Queue: Raymond Toy <rtoy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684137}
parent 62a4a8bf
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 0 deletions
third_party/blink/renderer/modules/webaudio/audio_param_timeline.cc
View file @ dea8b260
...@@ -1611,6 +1611,7 @@ std::tuple<size_t, float, unsigned> AudioParamTimeline::ProcessSetTarget( ...@@ -1611,6 +1611,7 @@ std::tuple<size_t, float, unsigned> AudioParamTimeline::ProcessSetTarget(
// with the target value. // with the target value.
if (HasSetTargetConverged(value, target, current_frame / sample_rate, time1, if (HasSetTargetConverged(value, target, current_frame / sample_rate, time1,
time_constant)) { time_constant)) {
current_frame += fill_to_frame - write_index;
for (; write_index < fill_to_frame; ++write_index) for (; write_index < fill_to_frame; ++write_index)
values[write_index] = target; values[write_index] = target;
} else { } else {
......
third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioparam-interface/set-target-conv.html 0 → 100644
View file @ dea8b260
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>Test convergence of setTargetAtTime</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/webaudio/resources/audit.js"></script>
<script src='/webaudio/resources/audio-param.js'></script>
</head>
<body>
<script>
let audit = Audit.createTaskRunner();
audit.define(
{task: 'setTargetAtTime', label: 'convergence handled correctly'},
(task, should) => {
// Two channels:
// 0 - actual result
// 1 - expected result
const context = new OfflineAudioContext(
{numberOfChannels: 2, sampleRate: 8000, length: 8000});
const merger = new ChannelMergerNode(
context, {numberOfChannels: context.destination.channelCount});
merger.connect(context.destination);
// Construct test source that will have tha AudioParams being tested
// to verify that the AudioParams are working correctly.
let src;
should(
() => src = new ConstantSourceNode(context),
'src = new ConstantSourceNode(context)')
.notThrow();
src.connect(merger, 0, 0);
src.offset.setValueAtTime(1, 0);
const timeConstant = 0.01;
// testTime must be at least 10*timeConstant. Also, this must not
// lie on a render boundary.
const testTime = 0.15;
const rampEnd = testTime + 0.001;
should(
() => src.offset.setTargetAtTime(0.5, 0.01, timeConstant),
`src.offset.setTargetAtTime(0.5, 0.01, ${timeConstant})`)
.notThrow();
should(
() => src.offset.setValueAtTime(0.5, testTime),
`src.offset.setValueAtTime(0.5, ${testTime})`)
.notThrow();
should(
() => src.offset.linearRampToValueAtTime(1, rampEnd),
`src.offset.linearRampToValueAtTime(1, ${rampEnd})`)
.notThrow();
// The reference node that will generate the expected output. We do
// the same automations, except we don't apply the setTarget
// automation.
const refSrc = new ConstantSourceNode(context);
refSrc.connect(merger, 0, 1);
refSrc.offset.setValueAtTime(0.5, 0);
refSrc.offset.setValueAtTime(0.5, testTime);
refSrc.offset.linearRampToValueAtTime(1, rampEnd);
src.start();
refSrc.start();
context.startRendering()
.then(audio => {
const actual = audio.getChannelData(0);
const expected = audio.getChannelData(1);
// Just verify that the actual output matches the expected
// starting a little bit before testTime.
let testFrame =
Math.floor(testTime * context.sampleRate) - 128;
should(actual.slice(testFrame), `output[${testFrame}:]`)
.beCloseToArray(
expected.slice(testFrame),
{relativeThreshold: 4.1724e-6});
})
.then(() => task.done());
});
audit.run();
</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