Profiling

audiogram/index.js

@@ -5,6 +5,8 @@ var path = require("path"),
     serverSettings = require("../settings/"),
     transports = require("../lib/transports/"),
     logger = require("../lib/logger/"),
+    Profiler = require("../lib/profiler.js"),
+    probe = require("../lib/probe.js"),
     getWaveform = require("./waveform.js"),
     initializeCanvas = require("./initialize-canvas.js"),
     drawFrames = require("./draw-frames.js"),
@@ -24,6 +26,8 @@ function Audiogram(settings) {
   this.videoPath = path.join(this.dir, "video.mp4");
   this.frameDir = path.join(this.dir, "frames");
 
+  this.profiler = new Profiler();
+
   return this;
 
 }
@@ -33,13 +37,31 @@ Audiogram.prototype.getWaveform = function(cb) {
 
   var self = this;
 
-  this.status("waveform");
+  this.status("probing");
+
+  probe(this.audioPath, function(err, data){
+
+    if (err) {
+      return cb(err);
+    }
+
+    if (self.settings.maxDuration && self.settings.maxDuration < data.duration) {
+      return cb("Exceeds max duration of " + self.settings.maxDuration + "s");
+    }
+
+    self.profiler.size(data.duration);
+    self.set("numFrames", self.numFrames = Math.floor(data.duration * self.settings.framesPerSecond));
+    self.status("waveform");
 
-  getWaveform(this.audioPath, this.settings, function(err, waveform){
+    getWaveform(self.audioPath, {
+      numFrames: self.numFrames,
+      samplesPerFrame: self.settings.samplesPerFrame
+    }, function(waveformErr, waveform){
+
+      return cb(waveformErr, self.settings.waveform = waveform);
 
-    self.set("numFrames", self.numFrames = waveform.length);
+    });
 
-    return cb(err, self.settings.waveform = waveform);
 
   });
 
@@ -154,6 +176,8 @@ Audiogram.prototype.render = function(cb) {
       self.set("url", transports.getURL(self.id));
     }
 
+    logger.debug(self.profiler.print());
+
     return cb(err);
 
   });
@@ -170,6 +194,7 @@ Audiogram.prototype.set = function(field, value) {
 
 // Convenience method for .set("status")
 Audiogram.prototype.status = function(value) {
+  this.profiler.start(value);
   return this.set("status", value);
 };
 

audiogram/waveform.js

@@ -4,39 +4,27 @@ var probe = require("../lib/probe.js"),
 
 function getWaveform(filename, options, cb) {
 
-  probe(filename, function(err, data) {
-
-    if (err) {
-      return cb(err);
-    }
-
-    if (options.maxDuration && options.maxDuration < data.duration) {
-      return cb("Exceeds max duration of " + options.maxDuration + "s");
+  var stream = pcmStream(filename, {
+        channels: options.channels
+      }),
+      samples = [];
+
+  stream.on("data",function(sample, channel){
+
+    // Average multiple channels
+    if (channel > 0) {
+      samples[samples.length - 1] = ((samples[samples.length - 1] * channel) + sample) / (channel + 1);
+    } else {
+      samples.push(sample);
     }
 
-    var stream = pcmStream(filename, {
-          channels: options.channels
-        }),
-        samples = [];
-
-    stream.on("data",function(sample, channel){
-
-      // Average multiple channels
-      if (channel > 0) {
-        samples[samples.length - 1] = ((samples[samples.length - 1] * channel) + sample) / (channel + 1);
-      } else {
-        samples.push(sample);
-      }
-
-    });
-
-    stream.on("error", cb);
+  });
 
-    stream.on("end", function(output){
-      var processed = processSamples(samples, Math.floor(data.duration * options.framesPerSecond), options.samplesPerFrame);
-      return cb(null, processed);
-    });
+  stream.on("error", cb);
 
+  stream.on("end", function(output){
+    var processed = processSamples(samples, options.numFrames, options.samplesPerFrame);
+    return cb(null, processed);
   });
 
 }

lib/profiler.js

@@ -0,0 +1,42 @@
+function Profiler() {
+  this._times = {};
+  return this;
+};
+
+Profiler.prototype.start = function(key) {
+  this.end(this._current);
+  this._current = key;
+  this._times[this._current] = { start: Date.now() };
+  return this;
+};
+
+Profiler.prototype.size = function(size) {
+  if (!arguments.length) return this._size;
+  this._size = size;
+  return this;
+};
+
+Profiler.prototype.end = function(key) {
+  if (key in this._times) this._times[key].end = Date.now();
+  return this;
+};
+
+Profiler.prototype.print = function(size) {
+  var rows = [],
+      row;
+
+  this.end(this._current);
+
+  for (var key in this._times) {
+    row = { key: key, time: this._times[key].end - this._times[key].start };
+    if (this._size) row.per = row.time / this._size;
+    rows.push(row);
+  }
+
+  return rows.map(function(row){
+    return row.key + ": " + Math.round(row.time) + "ms total" + (row.per ? ", " + Math.round(row.per) + "ms per" : "");
+  }).join("\n");
+
+};
+
+module.exports = Profiler;