Updating tests

audiogram/waveform.js

@@ -34,7 +34,6 @@ function getWaveform(filename, options, cb) {
 
     stream.on("end", function(output){
       var processed = processSamples(samples, Math.floor(data.duration * options.framesPerSecond), options.samplesPerFrame);
-      console.log(processed[0]);
       return cb(null, processed);
     });
 
@@ -48,6 +47,7 @@ function processSamples(samples, numFrames, samplesPerFrame) {
   var perFrame = Math.floor(samples.length / numFrames),
       perPoint = Math.floor(perFrame / samplesPerFrame),
       range = d3.range(samplesPerFrame),
+      maxFrame,
       min = max = 0;
 
   var unadjusted = d3.range(numFrames).map(function(frame){
@@ -65,7 +65,11 @@ function processSamples(samples, numFrames, samplesPerFrame) {
       }
 
       min = Math.min(min, localMin);
-      max = Math.max(max, localMax);
+
+      if (localMax > max) {
+        max = localMax;
+        maxFrame = frame;
+      }
 
       return [localMin, localMax];
 
@@ -73,14 +77,20 @@ function processSamples(samples, numFrames, samplesPerFrame) {
 
   });
 
-  console.log(unadjusted[0]);
+  // Scale up to -1 or 1
+  var adjustment = 1 / Math.max(Math.abs(min), Math.abs(max));
 
-  return unadjusted.map(function(frame){
+  var adjusted = unadjusted.map(function(frame){
     return frame.map(function(point){
-      return [-point[0] / min, point[1] / max];
+      return [adjustment * point[0], adjustment * point[1]];
     });
   });
 
+  // Make first and last frame peaky
+  adjusted[0] = adjusted[numFrames - 1] = adjusted[maxFrame];
+
+  return adjusted;
+
 }
 
 module.exports = getWaveform;

test/waveform-test.js

@@ -1,66 +1,73 @@
 var tape = require("tape"),
     path = require("path");
 
-var getWaveform = require("../audiogram/waveform.js");
+var getWaveform = require("../audiogram/waveform.js"),
+    probe = require("../lib/probe.js");
 
 var sample = path.join(__dirname, "data/glazed-donut.mp3");
 
 tape("Waveform", function(test) {
 
   var options = {
-    numFrames: 500,
+    framesPerSecond: 20,
     samplesPerFrame: 10
   };
 
-  getWaveform(sample, options, function(err, waveform){
+  probe(sample, function(e1, data){
 
-    test.error(err);
-    test.assert(Array.isArray(waveform) && waveform.length === options.numFrames);
+    test.error(e1);
 
-    var firstMax = Math.max.apply(null, waveform[0]);
+    getWaveform(sample, options, function(e2, waveform){
 
-    test.assert(firstMax <= 1);
+      test.error(e2);
+      test.assert(Array.isArray(waveform) && waveform.length === Math.floor(data.duration * options.framesPerSecond));
 
-    test.assert(waveform.every(function(frame){
-      return frame.length === options.samplesPerFrame;
-    }));
+      var firstMax = Math.max.apply(null, waveform[0].map(function(d){ return d[1]; }));
 
-    test.assert(waveform.every(function(frame){
-      return frame.every(function(val){
-        return typeof val === "number" && val >= 0 && val <= firstMax;
-      });
-    }));
+      test.assert(firstMax <= 1);
 
-    test.end();
+      test.assert(waveform.every(function(frame){
+        return frame.length === options.samplesPerFrame && frame.every(function(f){
+          return f.length === 2 && typeof f[0] === "number" && typeof f[1] === "number" && f[0] <= 0 && f[0] >= -1 && f[1] >= 0 && f[1] <= firstMax;
+        });
+      }));
+
+      test.end();
+
+    });
 
   });
 
 });
 
-tape("Waveform missing numFrames", function(test) {
+tape("Max Duration Error", function(test) {
 
   var options = {
-    samplesPerFrame: 10
+    framesPerSecond: 20,
+    samplesPerFrame: 10,
+    maxDuration: 20
   };
 
   getWaveform(sample, options, function(err, waveform){
 
-    test.ok(err);
+    test.assert(err);
     test.end();
 
   });
 
 });
 
-tape("Waveform missing samplesPerFrame", function(test) {
+tape("Max Duration OK", function(test) {
 
   var options = {
-    numFrames: 500,
+    framesPerSecond: 20,
+    samplesPerFrame: 10,
+    maxDuration: 30
   };
 
   getWaveform(sample, options, function(err, waveform){
 
-    test.ok(err);
+    test.error(err);
     test.end();
 
   });