A few small tweaks and improved configurability

Author: CaiB

ColorChord.NET/NoteFinder/Gen2NoteFinder.cs

@@ -25,6 +25,9 @@ public sealed class Gen2NoteFinder : NoteFinderCommon, ITimingSource
     [ConfigInt("Octaves", 1, 20, 6)]
     public uint OctaveCount { get; private set; }
 
+    [ConfigInt("BinsPerOctave", 4, 960, 24)]
+    private uint BPO = 24;
+
     [ConfigFloat("StartFreq", 0F, 20000F, 55F)]
     public float StartFrequency { get; private set; } = 55F;
 
@@ -77,7 +80,7 @@ public Gen2NoteFinder(string name, Dictionary<string, object> config)
 
         SetupBuffers();
         this.SampleRate = 48000; // TODO: Temporary until source is connected ahead of time
-        this.DFT = new(this.OctaveCount, 24, this.SampleRate, this.StartFrequency, this.LoudnessCorrectionAmount, RunTimingReceivers);
+        this.DFT = new(this.OctaveCount, this.BPO, this.SampleRate, this.StartFrequency, this.LoudnessCorrectionAmount, RunTimingReceivers);
         Reconfigure();
     }
 
@@ -106,7 +109,7 @@ public override void AdjustOutputSpeed(uint period)
     public override void SetSampleRate(int sampleRate)
     {
         this.SampleRate = (uint)sampleRate;
-        this.DFT = new(this.OctaveCount, 24, this.SampleRate, this.StartFrequency, this.LoudnessCorrectionAmount, RunTimingReceivers);
+        this.DFT = new(this.OctaveCount, this.BPO, this.SampleRate, this.StartFrequency, this.LoudnessCorrectionAmount, RunTimingReceivers);
         Reconfigure();
         Log.Debug($"There are {TimingReceivers.Length} timing receivers");
         for (int i = 0; i < TimingReceivers.Length; i++)

ColorChord.NET/Outputs/Display/Shaders/Spectrum.frag

@@ -1,11 +1,10 @@
 #version 330 core
 #extension GL_EXT_gpu_shader4 : enable
 
-#define BINS_PER_OCATVE 24
-
 in vec2 TexCoord;
 
 uniform int BinCount;
+uniform int BinsPerOctave;
 uniform sampler2D TextureRawBins;
 uniform usampler2D TexturePeakBits, TextureWidebandBits;
 uniform float ScaleFactor;
@@ -36,7 +35,7 @@ void main()
     float ChangeHere = texture(TextureRawBins, vec2((SectionHere + 0.5) / BinCount, 0.75)).r * 10.0;
     uint PeakHere = (texture(TexturePeakBits, vec2(((SectionHere / 8) + 0.5) / textureSize(TexturePeakBits, 0).x, 0.5)).r >> (SectionHere % 8)) & 1u;
     uint WidebandHere = (texture(TextureWidebandBits, vec2(((SectionHere / 8) + 0.5) / textureSize(TextureWidebandBits, 0).x, 0.5)).r >> (SectionHere % 8)) & 1u;
-    vec3 Colour = AngleToRGB(mod(float(SectionHere) / BINS_PER_OCATVE, 1.0), 1.0 - (0.8 * WidebandHere), min(1.0, 0.1 + (HeightHere * 3.0)) - (0.9 * WidebandHere));
+    vec3 Colour = AngleToRGB(mod(float(SectionHere) / BinsPerOctave, 1.0), 1.0 - (0.8 * WidebandHere), min(1.0, 0.1 + (HeightHere * 3.0)) - (0.9 * WidebandHere));
     float IsBar = step(abs(TexCoord.y), HeightHere);
     //float IsBar = (step(0.0, TexCoord.y) * step(TexCoord.y, HeightHere)) + ((step(0.0, -TexCoord.y) * step(-TexCoord.y, ChangeHere)));
     FragColor = vec4((IsBar * Colour) + ((1.0 - IsBar) * vec3(0.1) * PeakHere * Colour), 1.0);

ColorChord.NET/Outputs/Display/Spectrum.cs

@@ -30,7 +30,7 @@ public class Spectrum : IDisplayMode, IConfigurableAttr
     };
 
     private int VertexBufferHandle, VertexArrayHandle, TextureHandleRawBins, TextureHandlePeakBits, TextureHandleWidebandBits;
-    private int LocationBinCount, LocationScaleFactor, LocationExponent;
+    private int LocationBinCount, LocationBPO, LocationScaleFactor, LocationExponent;
 
     private float[] RawDataIn;
 
@@ -97,6 +97,8 @@ public void Load()
 
         this.LocationBinCount = this.Shader.GetUniformLocation("BinCount");
         GL.Uniform1(this.LocationBinCount, this.NoteFinder.AllBinValues.Length);
+        this.LocationBPO = this.Shader.GetUniformLocation("BinsPerOctave");
+        GL.Uniform1(this.LocationBPO, this.NoteFinder.BinsPerOctave);
         this.LocationScaleFactor = this.Shader.GetUniformLocation("ScaleFactor");
         GL.Uniform1(this.LocationScaleFactor, this.ScaleFactor);
         this.LocationExponent = this.Shader.GetUniformLocation("Exponent");

ColorChord.NET/Sources/WASAPILoopback.cs

@@ -144,7 +144,7 @@ public void Start()
         if (IsErrorAndOut(ErrorCode, "Could not get device timing info.")) { return; }
 
         ErrorCode = this.Client.GetCurrentSharedModeEnginePeriod(out IntPtr MixFormatPtr2, out uint FramesPerBatch); // TODO: Automatically scale this based on the framerate of the outputs
-        if (IsErrorAndOut(ErrorCode, "Could not get engine periodicity info.")) { return; }
+        if (IsErrorAndOut(ErrorCode, "Could not get current engine periodicity info.")) { return; }
 
         // Check if we can get PCM data directly (default is usually float)
         WaveFormatExtensible RequestedFormat = new()
@@ -170,7 +170,12 @@ public void Start()
             Marshal.FreeCoTaskMem(RequestedFormatPtr);
             RequestedFormatPtr = IntPtr.Zero;
             WaveFormatEx? ResponseFormat = WaveFormatEx.FromPointer(ResponseFormatPtr);
-            Log.Warn($"WASAPI responded with 0x{IsRequestSupportedRaw:X8} when PCM was requested, falling back to using its format instead.");
+
+#pragma warning disable CS0162 // Unreachable code detected
+            if (FORCE_DEFAULT_FORMAT) { Log.Warn("Requesting more optimal format from WASAPI was disabled at compile time."); }
+            else { Log.Warn($"WASAPI responded with 0x{IsRequestSupportedRaw:X8} when PCM was requested, falling back to using its format instead."); }
+#pragma warning restore CS0162 // Unreachable code detected
+
             this.FormatIsPCM = (this.MixFormat.IsExtensible() && this.MixFormat.SubFormat == WaveFormatGUIDs.PCM) || (!this.MixFormat.IsExtensible() && this.MixFormat.Format == WaveFormatBasic.PCM);
         }
         else
@@ -179,6 +184,10 @@ public void Start()
             this.FormatIsPCM = true;
         }
 
+        ErrorCode = this.Client.GetSharedModeEnginePeriod(IsRequestSupported ? RequestedFormatPtr : MixFormatPtr, out uint DefaultPeriodFrames, out uint FundamentalPeriodFrames, out uint MinimumPeriodFrames, out uint MaximumPeriodFrames);
+        if (IsErrorAndOut(ErrorCode, "Could not get detailed engine periodicity info.")) { return; }
+        Log.Debug($"WASAPI engine periodicities: default = {DefaultPeriodFrames}, fundamental = {FundamentalPeriodFrames}, min = {MinimumPeriodFrames}, max = {MaximumPeriodFrames} frames.");
+
         Log.Info($"Chosen audio format is {this.MixFormat.Format} {WaveFormatGUIDs.GetNameFromGUID(this.MixFormat.SubFormat)}, {this.MixFormat.ChannelCount} channel, {this.MixFormat.SampleRate}Hz sample rate, {this.MixFormat.BitsPerSample}b per sample.");
         Log.Info($"Default transaction period is {DefaultInterval} ticks, minimum is {MinimumInterval} ticks. Current mode is {FramesPerBatch} frames per dispatch.");
         this.BytesPerFrame = this.MixFormat.ChannelCount * (this.MixFormat.BitsPerSample / 8);

ColorChord.NET/Visualizers/NoteFinderPassthrough.cs

@@ -19,6 +19,12 @@ public class NoteFinderPassthrough : IVisualizer, IDiscrete1D
     [ConfigFloat("TimePeriod", -1000000, 1000000, 100)]
     private float TimePeriod = 100F;
 
+    [ConfigFloat("SaturationAmplifier", 0, 1000, 4.5F)]
+    private float SaturationAmplifier = 4.5F;
+
+    [ConfigFloat("SaturationExponent", 0, 100, 2F)]
+    private float SaturationExponent = 2F;
+
     private List<IOutput> Outputs = new(4);
 
     private uint[] Data;
@@ -40,7 +46,7 @@ public void GetData()
     {
         ReadOnlySpan<float> RawData = this.NoteFinder.AllBinValues;
         if (this.Data.Length != RawData.Length) { this.Data = new uint[RawData.Length]; }
-        for (int i = 0; i < RawData.Length; i++) { this.Data[i] = VisualizerTools.CCToRGB((float)i / this.NoteFinder.BinsPerOctave, 1F, MathF.Pow(RawData[i] * 4.5F, 2F)); }
+        for (int i = 0; i < RawData.Length; i++) { this.Data[i] = VisualizerTools.CCToRGB((float)i / this.NoteFinder.BinsPerOctave, 1F, MathF.Pow(RawData[i] * this.SaturationAmplifier, this.SaturationExponent)); }
         foreach (IOutput Out in this.Outputs) { Out.Dispatch(); }
     }