Move band-pass fix

OpenAcousticDevices · Jul 17, 2024 · f65c718 · f65c718
1 parent 17df0d0
commit f65c718
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/scripts/butterworth.js b/scripts/butterworth.js
@@ -258,16 +258,6 @@ function applyBandPassFilter (input, inputLength, output, sampleRate, freq1, fre
 
     }
 
-    if (freq2 >= sampleRate / 2) {
-
-        console.log('Applying high-pass filter as band-pass top value = Nyquist');
-
-        applyHighPassFilter(input, inputLength, output, sampleRate, freq1);
-
-        return;
-
-    }
-
     const filterCoefficients = designFilter(BUTTERWORTH_FILTER_BAND, sampleRate, freq1, freq2);
 
     const filter = {

diff --git a/scripts/index.js b/scripts/index.js
@@ -2524,7 +2524,17 @@ function getRenderSamples (reapplyFilter, updateThresholdedSampleArray, recalcul
             bandPassFilterValue1 = Math.max(...bandPassFilterSlider.getValue());
             console.log('Applying band-pass filter between', bandPassFilterValue0, 'and', bandPassFilterValue1, 'Hz');
 
-            applyBandPassFilter(downsampledUnfilteredSamples, sampleCount, filteredSamples, getSampleRate(), bandPassFilterValue0, bandPassFilterValue1);
+            if (bandPassFilterValue1 < sampleRate / 2) {
+
+                applyBandPassFilter(downsampledUnfilteredSamples, sampleCount, filteredSamples, getSampleRate(), bandPassFilterValue0, bandPassFilterValue1);
+
+            } else {
+
+                console.log('Applying high-pass filter as band-pass top value = Nyquist');
+
+                applyHighPassFilter(downsampledUnfilteredSamples, sampleCount, filteredSamples, getSampleRate(), bandPassFilterValue1);
+
+            }
 
             break;