Reduced memory allocations

Author: RaphiMC

src/main/java/net/raphimc/noteblocktool/audio/soundsystem/impl/JavaxSoundSystem.java

@@ -71,9 +71,11 @@ public synchronized void playSound(final String sound, final float pitch, final
     @Override
     public synchronized void writeSamples() {
         final long[] samples = new long[this.samplesPerTick];
+        final int[] outputBuffer = new int[this.samplesPerTick];
+        final int[] mutationBuffer = new int[this.samplesPerTick * 2];
         for (SoundInstance playingSound : this.playingSounds) {
-            playingSound.render();
-            playingSound.write(samples);
+            playingSound.render(mutationBuffer);
+            playingSound.write(samples, outputBuffer);
         }
         this.dataLine.write(this.writeNormalized(samples), 0, samples.length * 2);
         this.playingSounds.removeIf(SoundInstance::isFinished);
@@ -130,8 +132,6 @@ protected class SoundInstance {
         private final float volume;
         private final float panning;
         private final int sliceLength;
-        private final int[] mutationBuffer;
-        private final int[] outputBuffer;
         private final CircularBuffer mutatedSamplesBuffer;
         private int cursor = 0;
 
@@ -140,20 +140,18 @@ public SoundInstance(final int[] samples, final float pitch, final float volume,
             this.pitch = pitch;
             this.volume = volume;
             this.panning = panning;
-            this.sliceLength = (int) (JavaxSoundSystem.this.samplesPerTick / FORMAT.getChannels() * pitch) * FORMAT.getChannels() + FORMAT.getChannels();
-            this.mutationBuffer = new int[JavaxSoundSystem.this.samplesPerTick * 2];
-            this.outputBuffer = new int[JavaxSoundSystem.this.samplesPerTick];
+            this.sliceLength = (int) (JavaxSoundSystem.this.samplesPerTick * pitch / FORMAT.getChannels()) * FORMAT.getChannels() + FORMAT.getChannels();
             this.mutatedSamplesBuffer = new CircularBuffer(JavaxSoundSystem.this.samplesPerTick * 3);
         }
 
-        public void render() {
+        public void render(final int[] mutationBuffer) {
             if (!this.hasDataToRender()) return;
 
             final int sliceLength = Math.min(this.samples.length - this.cursor, this.sliceLength);
-            final long result = SoundSampleUtil.mutate(FORMAT, this.samples, this.cursor, sliceLength, this.pitch, this.volume, this.panning, this.mutationBuffer);
+            final long result = SoundSampleUtil.mutate(FORMAT, this.samples, this.cursor, sliceLength, this.pitch, this.volume, this.panning, mutationBuffer);
             final int mutationBufferAvailable = (int) (result >> 32);
             if (this.mutatedSamplesBuffer.hasSpaceFor(mutationBufferAvailable)) {
-                this.mutatedSamplesBuffer.addAll(this.mutationBuffer, mutationBufferAvailable);
+                this.mutatedSamplesBuffer.addAll(mutationBuffer, mutationBufferAvailable);
                 if ((int) result > 0) {
                     this.cursor += (int) result;
                 } else {
@@ -162,13 +160,13 @@ public void render() {
             }
         }
 
-        public void write(final long[] buffer) {
-            if (buffer.length < this.outputBuffer.length) {
+        public void write(final long[] samples, final int[] outputBuffer) {
+            if (samples.length < outputBuffer.length) {
                 throw new IllegalArgumentException("Buffer is too small");
             }
-            this.mutatedSamplesBuffer.takeAllSafe(this.outputBuffer);
-            for (int i = 0; i < buffer.length; i++) {
-                buffer[i] += this.outputBuffer[i];
+            this.mutatedSamplesBuffer.takeAllSafe(outputBuffer);
+            for (int i = 0; i < samples.length; i++) {
+                samples[i] += outputBuffer[i];
             }
         }
 

src/main/java/net/raphimc/noteblocktool/audio/soundsystem/impl/MultithreadedJavaxSoundSystem.java

@@ -31,6 +31,8 @@ public class MultithreadedJavaxSoundSystem extends JavaxSoundSystem {
     private final Queue<SoundInstance> soundsToMerge = new ConcurrentLinkedQueue<>();
     private final AtomicInteger syncLock = new AtomicInteger(0);
     private final long[][] threadSamples;
+    private final int[][] threadOutputBuffers;
+    private final int[][] threadMutationBuffers;
 
     public MultithreadedJavaxSoundSystem(final int maxSounds, final float playbackSpeed) {
         super(maxSounds, playbackSpeed);
@@ -41,8 +43,17 @@ public MultithreadedJavaxSoundSystem(final int maxSounds, final float playbackSp
         for (int i = 0; i < mergingThreads; i++) {
             this.threadSamples[i] = new long[this.samplesPerTick];
         }
+        this.threadOutputBuffers = new int[mergingThreads][];
+        for (int i = 0; i < mergingThreads; i++) {
+            this.threadOutputBuffers[i] = new int[this.samplesPerTick];
+        }
+        this.threadMutationBuffers = new int[renderingThreads][];
+        for (int i = 0; i < renderingThreads; i++) {
+            this.threadMutationBuffers[i] = new int[this.samplesPerTick * 2];
+        }
 
         for (int i = 0; i < renderingThreads; i++) {
+            final int finalI = i;
             this.threadPool.submit(() -> {
                 try {
                     while (!Thread.currentThread().isInterrupted()) {
@@ -51,7 +62,7 @@ public MultithreadedJavaxSoundSystem(final int maxSounds, final float playbackSp
                             Thread.sleep(1);
                             continue;
                         }
-                        soundInstance.render();
+                        soundInstance.render(this.threadMutationBuffers[finalI]);
                         this.soundsToMerge.add(soundInstance);
                     }
                 } catch (InterruptedException ignored) {
@@ -68,7 +79,7 @@ public MultithreadedJavaxSoundSystem(final int maxSounds, final float playbackSp
                             Thread.sleep(1);
                             continue;
                         }
-                        soundInstance.write(this.threadSamples[finalI]);
+                        soundInstance.write(this.threadSamples[finalI], this.threadOutputBuffers[finalI]);
                         this.syncLock.decrementAndGet();
                     }
                 } catch (InterruptedException ignored) {

src/main/java/net/raphimc/noteblocktool/frames/SongPlayerFrame.java

@@ -88,7 +88,7 @@ public static void close() {
     private final MonitoringSongPlayer songPlayer;
     private final Timer updateTimer;
     private final JComboBox<String> soundSystemComboBox = new JComboBox<>(new String[]{"OpenAL (better sound quality)", "Un4seen BASS", "Javax (better system compatibility)", "Javax multithreaded (experimental)"});
-    private final JSpinner maxSoundsSpinner = new JSpinner(new SpinnerNumberModel(256, 64, 8192, 64));
+    private final JSpinner maxSoundsSpinner = new JSpinner(new SpinnerNumberModel(256, 64, 10240, 64));
     private final JSlider volumeSlider = new JSlider(0, 100, 50);
     private final JButton playStopButton = new JButton("Play");
     private final JButton pauseResumeButton = new JButton("Pause");