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

fix: MP3 would not play if buffer size < 1152

Browse Source
This commit is contained in:
minjaesong
2023-12-11 16:50:58 +09:00
parent 96c9aed25a
commit 82e89452d6
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,37 +34,54 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
0.0 0.0
private val BS = AUDIO_BUFFER_SIZE private val BS = AUDIO_BUFFER_SIZE
private val MP3_CHUNK_SIZE = 1152
} }
private val gcd = FastMath.getGCD(inputSamplingRate, SAMPLING_RATE) // 300 for 44100, 48000 private val q = inputSamplingRate.toDouble() / SAMPLING_RATE // <= 1.0
private val samplesIn = inputSamplingRate / gcd // 147 for 44100 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 samplesOut = SAMPLING_RATE / gcd // 160 for 48000 private val internalBufferSize = fetchSize * 3
private val internalBufferSize = if (doResample) (BS.toFloat() / samplesOut).ceilToInt().plus(1) * samplesOut else BS // (512 / 160) -> 640 for 44100, 48000
private fun resampleBlock(inn: FloatArray, out: FloatArray) { private fun resampleBlock(innL: FloatArray, innR: FloatArray, outL: FloatArray, outR: FloatArray) {
fun getInn(i: Int) = if (i in inn.indices) inn[i] else 0f fun getInnL(i: Int) = if (i > innL.lastIndex) 0f else if (i in innL.indices) innL[i] else 0f//finOldL[TAPS + i]
fun getInnR(i: Int) = if (i > innR.lastIndex) 0f else if (i in innR.indices) innR[i] else 0f//finOldR[TAPS + i]
for (sampleIdx in out.indices) { for (sampleIdx in outL.indices) {
val x = (inn.size.toDouble() / out.size) * sampleIdx val x = fPhaseL + q * sampleIdx
var sx = 0.0 var sx = 0.0
for (i in x.floorToInt() - TAPS + 1..x.floorToInt() + TAPS) { for (i in x.floorToInt() - TAPS + 1..x.floorToInt() + TAPS) {
sx += getInn(i) * L(x - i) sx += getInnL(i) * L(x - i)
} }
out[sampleIdx] = sx.toFloat() outL[sampleIdx] = sx.toFloat()
} }
fPhaseL = -((fPhaseL + q * outL.size) % 1.0)
innL.takeLast(TAPS).forEachIndexed { index, fl -> finOldL[index] = fl }
for (sampleIdx in outR.indices) {
val x = fPhaseR + q * sampleIdx
var sx = 0.0
for (i in x.floorToInt() - TAPS + 1..x.floorToInt() + TAPS) {
sx += getInnR(i) * L(x - i)
}
outR[sampleIdx] = sx.toFloat()
}
fPhaseR = -((fPhaseR + q * outR.size) % 1.0)
innR.takeLast(TAPS).forEachIndexed { index, fl -> finOldR[index] = fl }
} }
var validSamplesInBuf = 0 var validSamplesInBuf = 0
val foutL = FloatArray(internalBufferSize + samplesOut) // 640 for (44100, 48000), 512 for (48000, 48000) with BUFFER_SIZE = 512 * 4 val finOldL = FloatArray(TAPS)
val foutR = FloatArray(internalBufferSize + samplesOut) // 640 for (44100, 48000), 512 for (48000, 48000) with BUFFER_SIZE = 512 * 4 val finOldR = FloatArray(TAPS)
var fPhaseL = 0.0
var fPhaseR = 0.0
val foutL = FloatArray(internalBufferSize) // 640 for (44100, 48000), 512 for (48000, 48000) with BUFFER_SIZE = 512 * 4
val foutR = FloatArray(internalBufferSize) // 640 for (44100, 48000), 512 for (48000, 48000) with BUFFER_SIZE = 512 * 4
fun fetchBytes() { fun fetchBytes() {
val readCount = ((internalBufferSize - validSamplesInBuf) / samplesOut.toFloat()).ceilToInt() * samplesIn // in samples (441 or 588 for 44100, 48000) val readCount = if (validSamplesInBuf < BS) fetchSize else 0
val writeCount = ((internalBufferSize - validSamplesInBuf) / samplesOut.toFloat()).ceilToInt() * samplesOut // in samples (480 or 640 for 44100, 48000) val writeCount = (readCount / q + fPhaseL).toInt()
val readBuf = ByteArray(readCount * 4) val readBuf = ByteArray(readCount * 4)
val finL = FloatArray(readCount) val finL = FloatArray(readCount)
val finR = FloatArray(readCount) val finR = FloatArray(readCount)
@@ -76,10 +93,10 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
if (readCount > 0) { if (readCount > 0) {
try { try {
val bytesRead = audioReadFun(readBuf) val bytesRead = audioReadFun(readBuf)
printdbg(this, "Reading audio $readCount samples, got ${bytesRead?.div(4)} samples") // printdbg(this, "Reading audio $readCount samples, got ${bytesRead?.div(4)} samples")
if (bytesRead == null || bytesRead <= 0) { if (bytesRead == null || bytesRead <= 0) {
printdbg(this, "Music finished; bytesRead = $bytesRead") // printdbg(this, "Music finished; bytesRead = $bytesRead")
onAudioFinished() onAudioFinished()
} }
@@ -108,8 +125,7 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
finally { finally {
if (doResample) { if (doResample) {
// perform resampling // perform resampling
resampleBlock(finL, foutL) resampleBlock(finL, finR, foutL, foutR)
resampleBlock(finR, foutR)
// fill in the output buffers // fill in the output buffers
System.arraycopy(foutL, 0, this.foutL, validSamplesInBuf, writeCount) System.arraycopy(foutL, 0, this.foutL, validSamplesInBuf, writeCount)
@@ -125,7 +141,7 @@ class AudioProcessBuf(inputSamplingRate: Int, val audioReadFun: (ByteArray) -> I
} }
} }
else { else {
printdbg(this, "Reading audio zero samples; Buffer: $validSamplesInBuf / $internalBufferSize samples") // printdbg(this, "Reading audio zero samples; Buffer: $validSamplesInBuf / $internalBufferSize samples")
} }
} }

2
src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
View File

@@ -454,7 +454,7 @@ class BasicDebugInfoWindow : UICanvas() {
private val oldRMS = Array(trackCount) { arrayOf(0.0, 0.0) } private val oldRMS = Array(trackCount) { arrayOf(0.0, 0.0) }
private val oldComp = Array(trackCount) { arrayOf(0.0, 0.0) } private val oldComp = Array(trackCount) { arrayOf(0.0, 0.0) }
private fun getSmoothingFactor(sampleCount: Int) = 1.0 - (AUDIO_BUFFER_SIZE / sampleCount) private fun getSmoothingFactor(sampleCount: Int) = 1.0 - (AUDIO_BUFFER_SIZE.toDouble() / sampleCount)
private val PEAK_SMOOTHING_FACTOR = getSmoothingFactor(640) private val PEAK_SMOOTHING_FACTOR = getSmoothingFactor(640)
private val LAMP_SMOOTHING_FACTOR = getSmoothingFactor(3200) private val LAMP_SMOOTHING_FACTOR = getSmoothingFactor(3200)
private val RMS_SMOOTHING_FACTOR = getSmoothingFactor(12000) private val RMS_SMOOTHING_FACTOR = getSmoothingFactor(12000)