Convert WaveShaper tests to testharness

third_party/WebKit/LayoutTests/webaudio/resources/waveshaper-testing.js

 var context;
 var lengthInSeconds = 2;
 
 // Skip this many frames before comparing against reference to allow
 // a steady-state to be reached in the up-sampling filters.
 var filterStabilizeSkipFrames = 2048;
 
 var numberOfCurveFrames = 65536;
 var waveShapingCurve;
 
@@ skipping 33 matching lines @@
     // each of which is scaled.
     for (var i = 0; i < n; ++i) {
         var x = (i - n2) / n2;
         var y = kScale * (T1(x) + T2(x) + T3(x) + T4(x));
         curve[i] = y;
     }
 
     return curve;
 }
 
-function checkShapedCurve(event) {
-    var buffer = event.renderedBuffer;
-
+function checkShapedCurve(buffer, should) {
     var outputData = buffer.getChannelData(0);
     var n = buffer.length;
 
     // The WaveShaperNode will have a processing latency if oversampling is used,
     // so we should account for it.
 
     // FIXME: .latency should be exposed as an attribute of the node
     // var waveShaperLatencyFrames = waveshaper.latency * sampleRate;
     // But for now we'll use the hard-coded values corresponding to the actual latencies:
     var waveShaperLatencyFrames = 0;
@@ skipping 40 matching lines @@
 
         if (j >= filterStabilizeSkipFrames) {
             if (deltaInDecibels > worstDeltaInDecibels) {
                 worstDeltaInDecibels = deltaInDecibels;
             }
         }
     }
 
     // console.log("worstDeltaInDecibels: " + worstDeltaInDecibels);
 
-    var success = worstDeltaInDecibels < acceptableAliasingThresholdDecibels;
-
-    if (success) {
-        testPassed(oversample + " WaveShaperNode oversampling within acceptable tolerance.");
-    } else {
-        testFailed(oversample + " WaveShaperNode oversampling not within acceptable tolerance.  Error = " + worstDeltaInDecibels + " dBFS");
-    }
-
-    finishJSTest();
+    should(worstDeltaInDecibels, oversample +
+            " WaveshaperNode oversampling error (in dBFS)")
+        .beLessThan(acceptableAliasingThresholdDecibels);
 }
 
 function createImpulseBuffer(context, sampleFrameLength) {
     var audioBuffer = context.createBuffer(1, sampleFrameLength, context.sampleRate);
     var n = audioBuffer.length;
     var dataL = audioBuffer.getChannelData(0);
 
     for (var k = 0; k < n; ++k)
         dataL[k] = 0;
 
     dataL[0] = 1;
 
     return audioBuffer;
 }
 
 function runWaveShaperOversamplingTest(testParams) {
     sampleRate = testParams.sampleRate;
     nyquist = 0.5 * sampleRate;
     oversample = testParams.oversample;
     fundamentalFrequency = testParams.fundamentalFrequency;
     acceptableAliasingThresholdDecibels = testParams.acceptableAliasingThresholdDecibels;
 
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
+    let audit = Audit.createTaskRunner();
 
-    window.jsTestIsAsync = true;
+    audit.define("test", function (task, should) {
+        task.describe(testParams.description);

[hongchan, 2017/02/22 19:05:35]

Ditto. How do we reconcile this with task.describe() CL?

[Raymond Toy, 2017/02/22 19:23:24]

Wait until that's landed.

 
-    // Create offline audio context.
-    var numberOfRenderFrames = sampleRate * lengthInSeconds;
-    context = new OfflineAudioContext(1, numberOfRenderFrames, sampleRate);
+        // Create offline audio context.
+        var numberOfRenderFrames = sampleRate * lengthInSeconds;
+        context = new OfflineAudioContext(1, numberOfRenderFrames, sampleRate);
 
-    // source -> waveshaper -> destination
-    var source = context.createBufferSource();
-    source.buffer = createToneBuffer(context, fundamentalFrequency, lengthInSeconds, 1);
+        // source -> waveshaper -> destination
+        var source = context.createBufferSource();
+        source.buffer = createToneBuffer(context, fundamentalFrequency, lengthInSeconds, 1);
 
-    // Apply a non-linear distortion curve.
-    waveshaper = context.createWaveShaper();
-    waveshaper.curve = generateWaveShapingCurve();
-    waveshaper.oversample = oversample;
+        // Apply a non-linear distortion curve.
+        waveshaper = context.createWaveShaper();
+        waveshaper.curve = generateWaveShapingCurve();
+        waveshaper.oversample = oversample;
 
-    source.connect(waveshaper);
-    waveshaper.connect(context.destination);
+        source.connect(waveshaper);
+        waveshaper.connect(context.destination);
 
-    source.start(0);
+        source.start(0);
 
-    context.oncomplete = checkShapedCurve;
-    context.startRendering();
+        context.startRendering()
+            .then(buffer => checkShapedCurve(buffer, should))
+            .then(task.done.bind(task));

[hongchan, 2017/02/22 19:05:35]

() => task.done()

[Raymond Toy, 2017/02/22 19:23:24]

Done.

+      });
+
+    audit.run();
 }