# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1490800867 -3600
# Node ID 1f529b6e2d88d929be36a86c6a9c4fca29264a6b
# Parent  d494f5fea8b191ba5954c656e7b190ef0c03f599# Parent  0b1c48849b4fbffb6f438d5567168980af0ad76f
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r d494f5fea8b1 -r 1f529b6e2d88 js/loudness.js
--- a/js/loudness.js	Tue Mar 28 13:20:52 2017 +0100
+++ b/js/loudness.js	Wed Mar 29 16:21:07 2017 +0100
@@ -80,6 +80,7 @@
     frame_size = Math.floor(buffer.sampleRate * frame_dur);
     step_size = Math.floor(frame_size * (1.0 - frame_overlap));
     num_frames = Math.floor((buffer.length - frame_size) / step_size);
+    num_frames = Math.max(num_frames, 1);
 
     MS = Array(buffer.numberOfChannels);
     for (var c = 0; c < buffer.numberOfChannels; c++) {
@@ -88,7 +89,11 @@
         for (var no = 0; no < num_frames; no++) {
             MS[c][no] = 0.0;
             for (var ptr = 0; ptr < frame_size; ptr++) {
-                var sample = data[no * step_size + ptr];
+                var i = no * step_size + ptr;
+                if (i >= buffer.length) {
+                    break;
+                }
+                var sample = data[i];
                 MS[c][no] += sample * sample;
             }
             MS[c][no] /= frame_size;