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

audiobank now returns samples in floats

Browse Source
This commit is contained in:
minjaesong
2024-04-11 20:57:47 +09:00
parent 3e12966e84
commit 670a308c78
4 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,29 +88,33 @@ class MixerTrackProcessor(bufferSize: Int, val rate: Int, val track: TerrarumAud
private fun allocateStreamBuf(track: TerrarumAudioMixerTrack) {
printdbg("Allocating a StreamBuf with rate ${track.currentTrack!!.samplingRate}")
streamBuf = AudioProcessBuf(track.currentTrack!!.samplingRate, { buffer ->
var bytesRead = track.currentTrack?.readBytes(buffer) ?: 0
streamBuf = AudioProcessBuf(track.currentTrack!!.samplingRate, { bufL, bufR ->
var samplesRead = track.currentTrack?.readSamples(bufL, bufR) ?: 0
// do gapless fetch if there is space in the buffer
if (track.doGaplessPlayback && bytesRead < buffer.size) {
if (track.doGaplessPlayback && samplesRead < bufL.size) {
track.currentTrack?.reset()
track.pullNextTrack()
bytesRead += read0(buffer, bytesRead)
samplesRead += read00(bufL, bufR, samplesRead)
}
bytesRead
samplesRead
}, { purgeStreamBuf() }).also {
// it.jitterMode = jitterMode
// it.jitterIntensity = jitterIntensity
}
}
private fun read0(buffer: ByteArray, bytesRead: Int): Int {
val tmpBuf = ByteArray(buffer.size - bytesRead)
val newRead = track.currentTrack?.readBytes(tmpBuf) ?: 0
private fun read00(bufL: FloatArray, bufR: FloatArray, samplesRead: Int): Int {
val bufSize = bufL.size - samplesRead
val tmpBufL = FloatArray(bufSize)
val tmpBufR = FloatArray(bufSize)
System.arraycopy(tmpBuf, 0, buffer, bytesRead, tmpBuf.size)
val newRead = track.currentTrack?.readSamples(tmpBufL, tmpBufR) ?: 0
System.arraycopy(tmpBufL, 0, bufL, samplesRead, tmpBufL.size)
System.arraycopy(tmpBufR, 0, bufR, samplesRead, tmpBufR.size)
return newRead
}