curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 11:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

reverb filter with lowpass

Browse Source
This commit is contained in:
minjaesong
2023-11-25 02:15:40 +09:00
parent 71a8d6d266
commit b1811a4013
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/audio/AudioMixer.kt
View File

@@ -102,7 +102,7 @@ object AudioMixer: Disposable {
init { init {
// musicTrack.filters[0] = BinoPan((Math.random() * 2.0 - 1.0).toFloat()) // musicTrack.filters[0] = BinoPan((Math.random() * 2.0 - 1.0).toFloat())
musicTrack.filters[1] = Reverb(36f, 0.9f, 100f) musicTrack.filters[1] = Reverb(36f, 0.92f, 1200f)
masterTrack.filters[0] = SoftClp masterTrack.filters[0] = SoftClp
masterTrack.filters[1] = Buffer masterTrack.filters[1] = Buffer

36
src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt
View File

@@ -143,7 +143,7 @@ class Highpass(cutoff0: Float): TerrarumAudioFilter() {
// println("LP Cutoff: $cutoff") // println("LP Cutoff: $cutoff")
val RC: Float = 1f / (cutoff * FastMath.TWO_PI) val RC: Float = 1f / (cutoff * FastMath.TWO_PI)
val dt: Float = 1f / SAMPLING_RATEF val dt: Float = 1f / SAMPLING_RATEF
alpha = dt / (RC + dt) alpha = RC / (RC + dt)
this.cutoff = cutoff.toDouble() this.cutoff = cutoff.toDouble()
} }
@@ -249,11 +249,15 @@ class Bitcrush(var steps: Int, var inputGain: Float = 1f): TerrarumAudioFilter()
} }
} }
class Reverb(val delayMS: Float, var feedback: Float, var lowpass: Float): TerrarumAudioFilter() { class Reverb(val delayMS: Float = 36f, var feedback: Float = 0.92f, var lowpass: Float = 1200f): TerrarumAudioFilter() {
private val highpass = 80f
private var delay = (SAMPLING_RATEF * delayMS / 1000f).roundToInt() private var delay = (SAMPLING_RATEF * delayMS / 1000f).roundToInt()
private val bufSize = delay private val bufSize = delay + 2
private val buf = Array<FloatArray>(2) { FloatArray(bufSize) }
private val buf = Array(2) { FloatArray(bufSize) }
private fun unshift(sample: Float, buf: FloatArray) { private fun unshift(sample: Float, buf: FloatArray) {
for (i in bufSize - 1 downTo 1) { for (i in bufSize - 1 downTo 1) {
buf[i] = buf[i - 1] buf[i] = buf[i - 1]
@@ -261,25 +265,27 @@ class Reverb(val delayMS: Float, var feedback: Float, var lowpass: Float): Terra
buf[0] = sample buf[0] = sample
} }
private val out0 = FloatArray(2)
override fun thru(inbuf0: List<FloatArray>, inbuf1: List<FloatArray>, outbuf0: List<FloatArray>, outbuf1: List<FloatArray>) { override fun thru(inbuf0: List<FloatArray>, inbuf1: List<FloatArray>, outbuf0: List<FloatArray>, outbuf1: List<FloatArray>) {
val RC: Float = 1f / (lowpass * FastMath.TWO_PI) val RCLo: Float = 1f / (lowpass * FastMath.TWO_PI)
val RCHi: Float = 1f / (highpass * FastMath.TWO_PI)
val dt: Float = 1f / SAMPLING_RATEF val dt: Float = 1f / SAMPLING_RATEF
val alpha = dt / (RC + dt) val alphaLo = dt / (RCLo + dt)
val alphaHi = RCHi / (RCHi + dt)
for (ch in outbuf1.indices) { for (ch in outbuf1.indices) {
for (i in 0 until BUFFER_SIZE / 4) { for (i in 0 until BUFFER_SIZE / 4) {
// TODO lowpass is not really working val inn = inbuf1[ch][i]
val in1 = inbuf1[ch][i]
val rv1 = buf[ch][delay - 1] // reverb
val rv0 = buf[ch][delay - 2] val rev = buf[ch][delay - 1]
val out = inn - rev * feedback
val reverb = (rv1 + alpha * (rv0 - rv1)) // fill lpbuf
val lp0 = buf[ch][0]
val out = in1 - reverb * feedback val lp = lp0 + alphaLo * (out - lp0)
unshift(lp, buf[ch])
unshift(out, buf[ch])
outbuf1[ch][i] = out outbuf1[ch][i] = out
} }