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

turns out it still clicks but at least it's quieter now

Browse Source
This commit is contained in:
minjaesong
2023-12-14 12:06:14 +09:00
parent 3233e57680
commit d0eb5428e8
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import net.torvald.terrarum.serialise.toUint
import org.dyn4j.Epsilon import org.dyn4j.Epsilon
import kotlin.math.PI import kotlin.math.PI
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
import kotlin.math.roundToInt
import kotlin.math.sin import kotlin.math.sin
private data class Frac(var nom: Int, val denom: Int) { private data class Frac(var nom: Int, val denom: Int) {
@@ -69,7 +70,6 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
private fun getOptimalBufferSize(rate: Int) = bufLut[BS to rate]!! private fun getOptimalBufferSize(rate: Int) = bufLut[BS to rate]!!
} }
private val denom = SAMPLING_RATE / FastMath.getGCD(inputSamplingRate, SAMPLING_RATE)
private val q = inputSamplingRate.toDouble() / SAMPLING_RATE // <= 1.0 private val q = inputSamplingRate.toDouble() / SAMPLING_RATE // <= 1.0
private val fetchSize = (BS.toFloat() / MP3_CHUNK_SIZE).ceilToInt() * MP3_CHUNK_SIZE // fetchSize is always multiple of MP3_CHUNK_SIZE, even if the audio is NOT MP3 private val fetchSize = (BS.toFloat() / MP3_CHUNK_SIZE).ceilToInt() * MP3_CHUNK_SIZE // fetchSize is always multiple of MP3_CHUNK_SIZE, even if the audio is NOT MP3
@@ -102,13 +102,6 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
var validSamplesInBuf = 0 var validSamplesInBuf = 0
private val preDelay = when (denom) {
160 -> 31 // 44100
320 -> 209 // 22050
640 -> 565 // 11025
else -> 0
}
private val finL = FloatArray(fetchSize + 2 * PADSIZE) private val finL = FloatArray(fetchSize + 2 * PADSIZE)
private val finR = FloatArray(fetchSize + 2 * PADSIZE) private val finR = FloatArray(fetchSize + 2 * PADSIZE)
private val fmidL = FloatArray((fetchSize / q + 1.0).toInt()) private val fmidL = FloatArray((fetchSize / q + 1.0).toInt())
@@ -124,7 +117,7 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
fun fetchBytes() { fun fetchBytes() {
val readCount = if (validSamplesInBuf < BS) fetchSize else 0 val readCount = if (validSamplesInBuf < BS) fetchSize else 0
val writeCount = (readCount / q).toInt() val writeCount = (readCount / q).roundToInt()
fun getFromReadBuf(i: Int, bytesRead: Int) = if (i < bytesRead) readBuf[i].toUint() else 0 fun getFromReadBuf(i: Int, bytesRead: Int) = if (i < bytesRead) readBuf[i].toUint() else 0