# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1490799195 -3600
# Node ID f8d4f2c514d8524f1c9874b36b361a161d1279d3
# Parent  2395223deef2277b2216d134dd8bf1d57c8e7050# Parent  f734e5fa2065e910f61e5aa0e2df051c36aaa7f5
Merge branch 'master' into vnext

# Conflicts:
#	js/loudness.js

diff -r 2395223deef2 -r f8d4f2c514d8 js/loudness.js
--- a/js/loudness.js	Tue Mar 28 13:04:29 2017 +0100
+++ b/js/loudness.js	Wed Mar 29 15:53:15 2017 +0100
@@ -80,6 +80,7 @@
     var frame_size = Math.floor(buffer.sampleRate * frame_dur);
     var step_size = Math.floor(frame_size * (1.0 - frame_overlap));
     var num_frames = Math.floor((buffer.length - frame_size) / step_size);
+    num_frames = Math.max(num_frames, 0);
 
     var MS = Array(buffer.numberOfChannels);
     for (var c = 0; c < buffer.numberOfChannels; c++) {