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

optimising dynamic source processing by NOT multithreading it

Browse Source
This commit is contained in:
minjaesong
2024-01-11 15:19:14 +09:00
parent 62e45d3281
commit 5973327ed6
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/net/torvald/terrarum/audio/AudioMixer.kt
View File

@@ -115,27 +115,33 @@ object AudioMixer: Disposable {
} }
private val processingExecutor = ThreadExecutor() private val processingExecutor = ThreadExecutor()
// private lateinit var processingSubthreads: List<Thread>
val processingThread = Thread { val processingThread = Thread {
/*while (processing) { // serial precessing
while (processing) {
actorNowPlaying = Terrarum.ingame?.actorNowPlaying
// process // process
dynamicTracks.forEach {
if (!it.processor.paused) {
try { it.processor.run() }
catch (e: Throwable) { e.printStackTrace() }
}
}
tracks.forEach { tracks.forEach {
if (!it.processor.paused) { if (!it.processor.paused) {
it.processor.run() try { it.processor.run() }
catch (e: Throwable) { e.printStackTrace() }
} }
} }
masterTrack.processor.run() masterTrack.processor.run()
/*while (masterTrack.pcmQueue.size >= BACK_BUF_COUNT && masterTrack.processor.running && processing) { while (processing && !masterTrack.pcmQueue.isEmpty) {
Thread.sleep(1)
}*/
while (!masterTrack.pcmQueue.isEmpty) {
masterTrack.adev!!.writeSamples(masterTrack.pcmQueue.removeFirst()) // it blocks until the queue is consumed masterTrack.adev!!.writeSamples(masterTrack.pcmQueue.removeFirst()) // it blocks until the queue is consumed
} }
}*/ }
while (processing) { // parallel processing, it seems even on the 7950X this is less efficient than serial processing...
/*while (processing) {
actorNowPlaying = Terrarum.ingame?.actorNowPlaying actorNowPlaying = Terrarum.ingame?.actorNowPlaying
for (tracks in parallelProcessingSchedule) { for (tracks in parallelProcessingSchedule) {
@@ -161,13 +167,10 @@ object AudioMixer: Disposable {
while (processing && !masterTrack.pcmQueue.isEmpty) { while (processing && !masterTrack.pcmQueue.isEmpty) {
masterTrack.adev!!.writeSamples(masterTrack.pcmQueue.removeFirst()) // it blocks until the queue is consumed masterTrack.adev!!.writeSamples(masterTrack.pcmQueue.removeFirst()) // it blocks until the queue is consumed
} }
} }*/
} }
val parallelProcessingSchedule: Array<Array<TerrarumAudioMixerTrack>> // val parallelProcessingSchedule: Array<Array<TerrarumAudioMixerTrack>>
// val feeder = FeedSamplesToAdev(BUFFER_SIZE, SAMPLING_RATE, masterTrack)
// val feedingThread = Thread(feeder)
init { init {
@@ -216,12 +219,13 @@ object AudioMixer: Disposable {
sfxSumBus.addSidechainInput(it, 1.0) sfxSumBus.addSidechainInput(it, 1.0)
} }
parallelProcessingSchedule = // unused for now
/*parallelProcessingSchedule =
arrayOf(musicTrack, ambientTrack, guiTrack).sliceEvenly(THREAD_COUNT / 2).toTypedArray() + arrayOf(musicTrack, ambientTrack, guiTrack).sliceEvenly(THREAD_COUNT / 2).toTypedArray() +
dynamicTracks.sliceEvenly(THREAD_COUNT / 2).toTypedArray() + dynamicTracks.sliceEvenly(THREAD_COUNT / 2).toTypedArray() +
arrayOf(sfxSumBus, sumBus, convolveBusOpen, convolveBusCave).sliceEvenly(THREAD_COUNT / 2).toTypedArray() + arrayOf(sfxSumBus, sumBus, convolveBusOpen, convolveBusCave).sliceEvenly(THREAD_COUNT / 2).toTypedArray() +
arrayOf(fadeBus) + arrayOf(fadeBus) +
arrayOf(masterTrack) arrayOf(masterTrack)*/
processingThread.priority = MAX_PRIORITY // higher = more predictable; audio delay is very noticeable so it gets high priority processingThread.priority = MAX_PRIORITY // higher = more predictable; audio delay is very noticeable so it gets high priority

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

@@ -16,7 +16,6 @@ import kotlin.math.*
class MixerTrackProcessor(val buffertaille: Int, val rate: Int, val track: TerrarumAudioMixerTrack): Runnable { class MixerTrackProcessor(val buffertaille: Int, val rate: Int, val track: TerrarumAudioMixerTrack): Runnable {
companion object { companion object {
val BACK_BUF_COUNT = 1
} }
@Volatile var running = true; private set @Volatile var running = true; private set