Long file spectrogram support. Fixed excessive memory use with long f…

…iles. Page down and Page up buttons now page through a file. Play button for detections - seeks timecode and plays detection region.
Mattk70 · Jan 31, 2022 · 423cd55 · 423cd55
1 parent 750174d
commit 423cd55
Show file tree

Hide file tree

Showing 7 changed files with 219 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Chirpity-Electron
 
-Electron app for sound file analysis with Chirpity.
+Electron app for sound file analysis with Chirpity. 
 
 Author: Matthew Kirkland
 
@@ -64,14 +64,12 @@ Install Bootstrap and its dependencies:
 ```
 npm install bootstrap
 npm install jquery
-npm install popper.js
+npm install popper
 ```
 
-This app also needs some additional packages that we have to install.
+This app also needs an additional package that we have to install.
 
 ```
-npm install audio-loader
-npm install audio-resampler
 npm install colormap
 ```
 
@@ -96,5 +94,6 @@ After that, we can export the app with:
 npm run export
 ```
 
+The resulting application will be saves in the "packages" folder.
 
 
diff --git a/index.html b/index.html
@@ -17,7 +17,7 @@
 
 
     <!-- App title -->
-    <title>Chirpity Sound Analysis</title>
+    <title>Chirpity Bird Call Detection</title>
 
 </head>
 <body>
@@ -110,6 +110,7 @@
             </button -->
 
         </div>
+        <div id="filename" class="align-bottom"></div>
         <div class="progressDiv" style="width: 20%;display: none"> Working...<br>
             <div class="progress" style="width: 100%">
                 <div class="progress-bar progress-bar-striped active" role="progressbar"
@@ -134,7 +135,8 @@
                 <th scope="col">Common name</th>
                 <th scope="col">Scientific name</th>
                 <th scope="col">Confidence</th>
-                <th scope="col"></th>
+                <th scope="col">Play</th>
+                <th scope="col"> View Alternates</th>
             </tr>
             </thead>
             <tbody class="text-dark" id="resultTableBody">

diff --git a/js/AudioBufferSlice.js b/js/AudioBufferSlice.js
@@ -0,0 +1,48 @@
+const audioContext = new (window.AudioContext || window.webkitAudioContext);
+
+function AudioBufferSlice(buffer, begin, end, callback) {
+    if (!(this instanceof AudioBufferSlice)) {
+        return new AudioBufferSlice(buffer, begin, end, callback);
+    }
+
+    let error = null;
+
+    const duration = buffer.duration;
+    const channels = buffer.numberOfChannels;
+    const rate = buffer.sampleRate;
+
+    if (typeof end === 'function') {
+        callback = end;
+        end = duration;
+    }
+
+    // handle short clips and beginning /end of files
+    if (end > duration) end = duration;
+    if (begin < 0) begin = 0;
+
+    if (typeof callback !== 'function') {
+        error = new TypeError('callback must be a function');
+    }
+
+    const startOffset = rate * begin;
+    const endOffset = rate * end;
+    const frameCount = endOffset - startOffset;
+    let newArrayBuffer;
+
+    try {
+        newArrayBuffer = audioContext.createBuffer(channels, endOffset - startOffset, rate);
+        const anotherArray = new Float32Array(frameCount);
+        const offset = 0;
+
+        for (let channel = 0; channel < channels; channel++) {
+            buffer.copyFromChannel(anotherArray, channel, startOffset);
+            newArrayBuffer.copyToChannel(anotherArray, channel, offset);
+        }
+    } catch (e) {
+        error = e;
+    }
+
+    callback(error, newArrayBuffer);
+}
+
+module.exports = AudioBufferSlice;
diff --git a/js/model.js b/js/model.js