From 44ff8efd636d6739b6d0b4e63bd39fa40eace126 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 27 Dec 2023 02:57:56 +0900 Subject: [PATCH] hann window for spectroscope --- src/net/torvald/terrarum/audio/dsp/Spectro.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/net/torvald/terrarum/audio/dsp/Spectro.kt b/src/net/torvald/terrarum/audio/dsp/Spectro.kt index bf3ac8fe3..5b3cbe12c 100644 --- a/src/net/torvald/terrarum/audio/dsp/Spectro.kt +++ b/src/net/torvald/terrarum/audio/dsp/Spectro.kt @@ -19,7 +19,7 @@ class Spectro : TerrarumAudioFilter() { private val chsum = ComplexArray(FloatArray(2*FFTSIZE)) private val fftOut = ComplexArray(FloatArray(2*FFTSIZE)) -// private val fftWin = FloatArray(FFTSIZE) { sin2(PI * it / FFTSIZE).toFloat() } // hann + private val fftWin = FloatArray(FFTSIZE) { sin2(PI * it / FFTSIZE).toFloat() } // hann private val a0 = 0.21557895 private val a1 = 0.41663158 @@ -27,7 +27,7 @@ class Spectro : TerrarumAudioFilter() { private val a3 = 0.083578947 private val a4 = 0.006947368 private val FT = PI / FFTSIZE - private val fftWin = FloatArray(FFTSIZE) { (a0 - a1*cos(2*it*FT) + a2*cos(4*it*FT) - a3*cos(6*it*FT) + a4*cos(8*it*FT)).toFloat() } // flat-top +// private val fftWin = FloatArray(FFTSIZE) { (a0 - a1*cos(2*it*FT) + a2*cos(4*it*FT) - a3*cos(6*it*FT) + a4*cos(8*it*FT)).toFloat() } // flat-top private val sqrt2p = 0.7071067811865475 @@ -63,7 +63,8 @@ class Spectro : TerrarumAudioFilter() { } } - private val spectroPlotCol = Color(0xdf6fa0_aa.toInt()) +// private val spectroPlotCol = Color(0xdf6fa0_aa.toInt()) + private val spectroPlotCol = Color(0x61b3df_aa) private val lowlim = -60.0