More work on Octave Frequency scales

Issue #332
QutEcoacoustics · Aug 13, 2020 · 5908e27 · 5908e27
1 parent 0a643f1
commit 5908e27
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 25 deletions.
diff --git a/src/AnalysisPrograms/SpectrogramGenerator/SpectrogramGenerator.Core.cs b/src/AnalysisPrograms/SpectrogramGenerator/SpectrogramGenerator.Core.cs
@@ -430,7 +430,7 @@ public static Image<Rgb24> GetOctaveScaleSpectrogram(
         AudioRecording recording,
         string sourceRecordingName)
         {
-            // ensure that the freq scale and the config are consistent.
+            // ensure that the freq scale and the spectrogram config are consistent.
             sgConfig.WindowSize = freqScale.WindowSize;
             freqScale.WindowStep = sgConfig.WindowStep;
             sgConfig.WindowOverlap = SonogramConfig.CalculateFrameOverlap(freqScale.WindowSize, freqScale.WindowStep);
@@ -441,15 +441,15 @@ public static Image<Rgb24> GetOctaveScaleSpectrogram(
 
             var octaveScaleGram = new SpectrogramOctaveScale(sgConfig, freqScale, recording.WavReader);
             var image = octaveScaleGram.GetImage();
-            var titleBar = BaseSonogram.DrawTitleBarOfGrayScaleSpectrogram(
-                    "OCTAVE-SCALE SPECTROGRAM " + sourceRecordingName,
-                    image.Width,
-                    ImageTags[OctaveScaleSpectrogram]);
-            var startTime = TimeSpan.Zero;
-            var xAxisTicInterval = TimeSpan.FromSeconds(1);
-            TimeSpan xAxisPixelDuration = TimeSpan.FromSeconds(sgConfig.WindowStep / (double)sgConfig.SampleRate);
-            var labelInterval = TimeSpan.FromSeconds(5);
-            image = BaseSonogram.FrameSonogram(image, titleBar, startTime, xAxisTicInterval, xAxisPixelDuration, labelInterval);
+            var title = "OCTAVE-SCALE SPECTROGRAM " + sourceRecordingName;
+
+            //var titleBar = BaseSonogram.DrawTitleBarOfGrayScaleSpectrogram(title, image.Width, ImageTags[OctaveScaleSpectrogram]);
+            //var startTime = TimeSpan.Zero;
+            //var xAxisTicInterval = TimeSpan.FromSeconds(1);
+            //TimeSpan xAxisPixelDuration = TimeSpan.FromSeconds(sgConfig.WindowStep / (double)sgConfig.SampleRate);
+            //var labelInterval = TimeSpan.FromSeconds(5);
+            //image = BaseSonogram.FrameSonogram(image, titleBar, startTime, xAxisTicInterval, xAxisPixelDuration, labelInterval);
+            image = octaveScaleGram.GetImageFullyAnnotated(image, title, freqScale.GridLineLocations);
             return image;
         }
 

diff --git a/src/AudioAnalysisTools/DSP/FrequencyScale.cs b/src/AudioAnalysisTools/DSP/FrequencyScale.cs
@@ -8,7 +8,6 @@ namespace AudioAnalysisTools.DSP
     using System.IO;
     using Acoustics.Shared.ImageSharp;
     using AudioAnalysisTools.StandardSpectrograms;
-    using AudioAnalysisTools.WavTools;
     using SixLabors.ImageSharp;
     using SixLabors.ImageSharp.PixelFormats;
     using SixLabors.ImageSharp.Processing;
@@ -27,7 +26,7 @@ public enum FreqScaleType
         Mel = 1,
         OctaveCustom = 2,
         OctaveStandard = 3,
-        OctaveDataReduction = 3,
+        OctaveDataReduction = 4,
     }
 
     public class FrequencyScale
@@ -220,24 +219,17 @@ public FrequencyScale(FreqScaleType fst)
         public int[,] GridLineLocations { get; set; }
 
         /// <summary>
-        /// returns the binId for the grid line closest to the passed frequency.
+        /// returns the binId for freq bin closest to the passed Hertz value.
         /// </summary>
-        public int GetBinIdForHerzValue(int herzValue)
+        public int GetBinIdForHerzValue(int hertzValue)
         {
             int binId = 0;
-            int binCount = this.BinBounds.GetLength(0);
-
-            for (int i = 1; i < binCount; i++)
+            while (this.BinBounds[binId, 1] < hertzValue)
             {
-                if (this.BinBounds[i, 1] > herzValue)
-                {
-                    binId = this.BinBounds[i, 0];
-                    break;
-                }
+                binId++;
             }
 
-            // subtract 1 because have actually extracted the upper bin bound
-            return binId - 1;
+            return binId;
         }
 
         /// <summary>

diff --git a/src/AudioAnalysisTools/DSP/OctaveFreqScale.cs b/src/AudioAnalysisTools/DSP/OctaveFreqScale.cs
@@ -204,7 +204,7 @@ public static FrequencyScale GetStandardOctaveScale(FrequencyScale scale)
 
         public static int[,] GetGridLineLocations(int nyquist, int linearBound, int[,] octaveBinBounds)
         {
-            int[] gridLocationsHertz = { 62, 125, 250, 500, 1000, 2000, 4000, 8000, 16000, 32000 };
+            int[] gridLocationsHertz = { 62, 125, 250, 500, 1000, 2000, 4000, 8000, 16000, 32000, 64000, 128000 };
             int binCount = octaveBinBounds.GetLength(0);
             var gridLineLocations = new List<int[]>();
             var upperBound = nyquist * 0.75;