Enable Mel-scale transforms & limit spectrograms according to bandwid…

…th parameters
QutEcoacoustics · Jan 17, 2018 · 5c9cc84 · 5c9cc84
1 parent 94e49cf
commit 5c9cc84
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/AudioAnalysis/AnalysisPrograms/StandardizedFeatures/StandardizedFeatureExtraction.cs b/AudioAnalysis/AnalysisPrograms/StandardizedFeatures/StandardizedFeatureExtraction.cs
@@ -80,9 +80,10 @@ public override AnalysisResult2 Analyze<T>(AnalysisSettings analysisSettings, Se
             // Default behaviour: set SUBSEGMENT = total recording
             AudioRecording subsegmentRecording = recording;
 
+            // Only for debug create image
             // Create list to store images so they can be combined later
             var list = new List<Image>();
-            string imagePath = Path.Combine(outputDirectory.FullName, segmentSettings.SegmentImageFile.Name);
+            string imagePath = segmentSettings.SegmentImageFile.FullName;
             int maxImageWidth = 0;
 
             foreach (var band in configuration.Bands)
@@ -95,7 +96,26 @@ public override AnalysisResult2 Analyze<T>(AnalysisSettings analysisSettings, Se
 
                 // Prepare amplitude spectrogram
                 double[,] amplitudeSpectrogramData = dspOutput1.AmplitudeSpectrogram; // get amplitude spectrogram.
-                var image = ImageTools.DrawReversedMatrix(MatrixTools.MatrixRotate90Anticlockwise(amplitudeSpectrogramData));
+                double[,] m;
+
+                // Transform from Frequency to Mel Scale
+                // band.Melscale defines the number of bins that will be reduced to
+                if (band.MelScale != 0)
+                {
+                    m = MFCCStuff.MelFilterBank(amplitudeSpectrogramData, band.MelScale, recording.Nyquist, 0, recording.Nyquist);
+                }
+                else
+                {
+                    m = amplitudeSpectrogramData;
+                }
+
+                // Select band determined by min and max bandwidth
+                int minBand = (int)(m.GetLength(1) * band.Bandwidth.Min);
+                int maxBand = (int)(m.GetLength(1) * band.Bandwidth.Max);
+
+                double[,] mband = MatrixTools.Submatrix(m, 0, minBand, m.GetLength(0) - 1, maxBand);
+
+                var image = ImageTools.DrawReversedMatrix(MatrixTools.MatrixRotate90Anticlockwise(mband));
 
                 // Add image to list
                 list.Add(image);
@@ -118,6 +138,29 @@ public override AnalysisResult2 Analyze<T>(AnalysisSettings analysisSettings, Se
                 LoggedConsole.WriteLine("See {0} for spectrogram pictures", imagePath);
             }
 
+            // Work in progress to calculate spectral indices..
+
+            //FileInfo IndexPropertiesConfigFile = new FileInfo(configuration.IndexPropertiesConfig);
+
+            //// Convert the dynamic config to IndexCalculateConfig class and merge in the unnecesary parameters.
+            //IndexCalculateConfig config = IndexCalculateConfig.GetConfig(analysisSettings.Configuration, false);
+
+            //var indexCalculateResults = new IndexCalculateResult[1];
+
+            //var indexCalculateResult = IndexCalculate.Analysis(
+            //    recording,
+            //    segmentSettings.SegmentStartOffset,
+            //    IndexPropertiesConfigFile,
+            //    configuration.ResampleRate,
+            //    segmentSettings.SegmentStartOffset,
+            //    config);
+
+            //indexCalculateResults[0] = indexCalculateResult;
+
+            //IndexCalculateResult[] subsegmentResults = indexCalculateResults;
+
+            //analysisResults.SpectralIndices = new SpectralIndexBase[subsegmentResults.Length];
+
             return analysisResults;
         }
 

diff --git a/AudioAnalysis/AnalysisPrograms/StandardizedFeatures/StandardizedFeatureExtractionConfig.cs b/AudioAnalysis/AnalysisPrograms/StandardizedFeatures/StandardizedFeatureExtractionConfig.cs
@@ -6,7 +6,9 @@ namespace AnalysisPrograms.StandardizedFeatures
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
     using AnalysisBase;
+    using AudioAnalysisTools.Indices;
 
     [Serializable]
     public class StandardizedFeatureExtractionConfig