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

option for speaker/headphone selection for appropriate panning

Browse Source
This commit is contained in:
minjaesong
2024-01-14 19:37:41 +09:00
parent 871396cd92
commit e89e32eeea
6 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,9 +24,18 @@ private data class Frac(var nom: Int, val denom: Int) {
*
* Created by minjaesong on 2023-11-17.
*/
class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> Int?, val onAudioFinished: () -> Unit) {
class AudioProcessBuf(val inputSamplingRate: Int, val audioReadFun: (ByteArray) -> Int?, val onAudioFinished: () -> Unit) {
private val doResample = inputSamplingRate != SAMPLING_RATE
var playbackSpeed = 1f
set(value) {
field = value.coerceIn(0.5f, 2f)
}
private val internalSamplingRate
get() = inputSamplingRate * playbackSpeed
private val doResample
get() = (internalSamplingRate - SAMPLING_RATE).absoluteValue >= 0.5f
companion object {
private val epsilon: Double = Epsilon.E
@@ -62,7 +71,7 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
arrayOf(48000,44100,32768,32000,24000,22050,16384,16000,12000,11025,8192,8000).forEachIndexed { ri, r ->
arrayOf(128,256,512,1024,2048).forEachIndexed { bi, b ->
bufLut[b to r] = bl[bi * 12 + ri]
bufLut[b to r] = bl[bi * 12 + ri] * 2
}
}
}
@@ -70,7 +79,8 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
private fun getOptimalBufferSize(rate: Int) = bufLut[BS to rate]!!
}
private val q = inputSamplingRate.toDouble() / SAMPLING_RATE // <= 1.0
private val q
get() = internalSamplingRate.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 internalBufferSize = getOptimalBufferSize(inputSamplingRate)// fetchSize * 3

9
src/net/torvald/terrarum/audio/dsp/BinoPan.kt
View File

@@ -75,11 +75,16 @@ class BinoPan(var pan: Float, var earDist: Float = EARDIST_DEFAULT): TerrarumAud
val timeDiffMax = earDist.coerceAtMost(EARDIST_MAX) / AudioMixer.SPEED_OF_SOUND * SAMPLING_RATEF
val angle = pan * HALF_PI
val delayInSamples = (timeDiffMax * FastMath.sin(angle)).absoluteValue
val delayInSamples = if (App.getConfigString("audio_speaker_setup") == "headphone")
(timeDiffMax * FastMath.sin(angle)).absoluteValue
else 0f
val volMultDbThis = PANNING_CONST * pan.absoluteValue
val volMultFsThis = decibelsToFullscale(volMultDbThis).toFloat()
val volMultFsOther = 1f / volMultFsThis
val volMultFsOther = if (App.getConfigString("audio_speaker_setup") == "headphone")
1f / volMultFsThis
else
(1f - pan.absoluteValue).coerceIn(0f, 1f)
if (pan >= 0) {
delays[L] = delayInSamples