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

meter rms and smoothing

Browse Source
This commit is contained in:
minjaesong
2023-11-23 02:35:48 +09:00
parent b06d649039
commit 39f3ff89b7
3 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/net/torvald/terrarum/audio/MixerTrackProcessor.kt
View File

@@ -2,7 +2,9 @@ package net.torvald.terrarum.audio
import com.badlogic.gdx.utils.Queue
import net.torvald.reflection.forceInvoke
import net.torvald.terrarum.sqr
import kotlin.math.absoluteValue
import kotlin.math.sqrt
import kotlin.math.tanh
/**
@@ -28,8 +30,9 @@ class MixerTrackProcessor(val bufferSize: Int, val rate: Int, val track: Terraru
private var fout0 = listOf(emptyBuf, emptyBuf)
private var fout1 = listOf(emptyBuf, emptyBuf)
var maxSigLevel = arrayOf(0.0, 0.0); private set
var hasClipping = arrayOf(false, false); private set
val maxSigLevel = arrayOf(0.0, 0.0)
val maxRMS = arrayOf(0.0, 0.0)
val hasClipping = arrayOf(false, false)
private var breakBomb = false
@@ -149,6 +152,9 @@ class MixerTrackProcessor(val bufferSize: Int, val rate: Int, val track: Terraru
fout1.map { it.maxOf { it.absoluteValue } }.forEachIndexed { index, fl ->
maxSigLevel[index] = fl.toDouble()
}
fout1.map { it.sumOf { it.sqr().toDouble() } }.forEachIndexed { index, fl ->
maxRMS[index] = sqrt(fl / (bufferSize / 4))
}
hasClipping.fill(false)
fout1.forEachIndexed { index, floats ->
var lastSample = floats[0]
@@ -164,6 +170,7 @@ class MixerTrackProcessor(val bufferSize: Int, val rate: Int, val track: Terraru
}
else {
maxSigLevel.fill(0.0)
maxRMS.fill(0.0)
hasClipping.fill(false)
}

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

@@ -28,10 +28,10 @@ object NullFilter : TerrarumAudioFilter() {
}
object SoftLim : TerrarumAudioFilter() {
var downForce = 1.0f; private set
val downForce = arrayOf(1.0f, 1.0f)
override fun thru(inbuf0: List<FloatArray>, inbuf1: List<FloatArray>, outbuf0: List<FloatArray>, outbuf1: List<FloatArray>) {
downForce = 1.0f
downForce.fill(1.0f)
for (ch in inbuf1.indices) {
val inn = inbuf1[ch]
@@ -44,7 +44,7 @@ object SoftLim : TerrarumAudioFilter() {
out[i] = v
if (!diff.isNaN()) {
downForce = minOf(downForce, diff)
downForce[ch] = minOf(downForce[ch], diff)
}
}
}