i think we are nearing v1.0.0

Author: noriah

config.go

@@ -39,11 +39,17 @@ type Config struct {
 }
 
 // NewZeroConfig returns a zero config
+// it is the "default"
+//
+// nora's defaults:
+//  - sampleRate: 122880
+//  - sampleSize: 2048
+//  - super smooth detail view
 func NewZeroConfig() Config {
 	return Config{
 		SampleRate:   44100,
-		SmoothFactor: 65.5,
-		WinVar:       0.5,
+		SmoothFactor: 19.69,
+		WinVar:       0.50,
 		BaseThick:    1,
 		BarWidth:     2,
 		SpaceWidth:   1,
@@ -58,6 +64,8 @@ func sanitizeConfig(cfg *Config) error {
 	switch {
 	case cfg.WinVar > 1.0:
 		cfg.WinVar = 1.0
+	case cfg.WinVar < 0.0:
+		cfg.WinVar = 0.0
 	default:
 	}
 

dsp/spectrum.go

@@ -10,39 +10,43 @@ import (
 
 // Spectrum is an audio spectrum in a buffer
 type Spectrum struct {
-	numBins int
-
-	fftSize int
-
-	sampleSize int
-	sampleRate float64
-
-	winVar float64
-
-	smoothFactor float64
-
-	bins []bin
-
-	fftBuf []complex128
-
-	streams []*stream
+	numBins      int          // number of bins we look at
+	fftSize      int          // number of fft bins
+	sampleSize   int          // number of samples per slice
+	sampleRate   float64      // audio sample rate
+	winVar       float64      // window variable
+	smoothFactor float64      // smothing factor
+	bins         []bin        // bins for processing
+	fftBuf       []complex128 // fft return buffer
+	streams      []*stream    // streams of data
 }
 
 type bin struct {
-	eqVal float64
-
-	floorFFT int
-	ceilFFT  int
-	widthFFT int
+	eqVal    float64 // equalizer value
+	floorFFT int     // floor fft index
+	ceilFFT  int     // ceiling fft index
+	widthFFT int     // fft floor-ceiling index delta
 }
 
 type stream struct {
-	input []float64
-	buf   []float64
-	pBuf  []float64
-	plan  *fft.Plan
+	input []float64 // input data buffer
+	buf   []float64 // bar bin buffer
+	pBuf  []float64 // previous run bin buffer
+	plan  *fft.Plan // fft plan
 }
 
+// SpectrumType is the type of calculation we run
+type SpectrumType int
+
+// Spectrum calculation types
+const (
+	SpectrumLog SpectrumType = iota
+	SpectrumEqual
+
+	// SpectrumDefault is the default spectrum type
+	SpectrumDefault = SpectrumLog
+)
+
 // Frequencies are the dividing frequencies
 var Frequencies = []float64{
 	// sub sub bass
@@ -60,18 +64,6 @@ var Frequencies = []float64{
 	// everything else
 }
 
-// SpectrumType is the type of calculation we run
-type SpectrumType int
-
-// Spectrum calculation types
-const (
-	SpectrumLog SpectrumType = iota
-	SpectrumEqual
-
-	// SpectrumDefault is the default spectrum type
-	SpectrumDefault = SpectrumLog
-)
-
 // Some notes:
 //
 // https://stackoverflow.com/questions/3694918/how-to-extract-frequency-associated-with-fft-values-in-python
@@ -90,7 +82,7 @@ func NewSpectrum(hz float64, size int) *Spectrum {
 		fftSize:      fftSize,
 		sampleSize:   size,
 		sampleRate:   hz,
-		smoothFactor: 0.655,
+		smoothFactor: 0.1969,
 		winVar:       1.0,
 		bins:         make([]bin, size+1),
 		fftBuf:       make([]complex128, fftSize),
@@ -161,7 +153,7 @@ func (sp *Spectrum) Process(win window.Function) {
 
 			// mag /= float64(sp.bins[xB].widthFFT)
 
-			var pow = 0.6
+			var pow = 0.65
 
 			switch {
 			case mag < 0.0:
@@ -172,9 +164,10 @@ func (sp *Spectrum) Process(win window.Function) {
 				pow *= math.Max(0.6, float64(xF)/fBassCut)
 
 			default:
-				mag *= sp.bins[xB].eqVal
 			}
 
+			mag *= sp.bins[xB].eqVal
+
 			mag = math.Pow(mag, pow)
 
 			// Smoothing
@@ -319,18 +312,28 @@ func (sp *Spectrum) freqToIdx(freq float64, round mathFunc) int {
 
 // SetWinVar sets the winVar used for distribution spread
 func (sp *Spectrum) SetWinVar(g float64) {
-	if g <= 0.0 {
-		g = 1
+	switch {
+
+	case g <= 0.0:
+		sp.winVar = 1.0
+
+	default:
+		sp.winVar = g
+
 	}
 
-	sp.winVar = g
 }
 
 // SetSmoothing sets the smoothing parameters
 func (sp *Spectrum) SetSmoothing(factor float64) {
-	if factor <= 0 {
-		factor = math.SmallestNonzeroFloat64
+	switch {
+
+	case factor <= 0.0:
+		sp.smoothFactor = math.SmallestNonzeroFloat64
+
+	default:
+		sp.smoothFactor = factor
+
 	}
 
-	sp.smoothFactor = factor
 }

dsp/window/window.go

@@ -5,7 +5,7 @@ package window
 
 import "math"
 
-// Function is a function that will do window things for you
+// Function is a function that will do window things for you on a slice
 type Function func(buf []float64)
 
 // Rectangle is just do nothing