Greatly improved javax sound

RaphiMC · May 8, 2024 · 4ee7b1a · 4ee7b1a
1 parent 4d04aad
commit 4ee7b1a
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/src/main/java/net/raphimc/noteblocktool/util/SoundSampleUtil.java b/src/main/java/net/raphimc/noteblocktool/util/SoundSampleUtil.java
@@ -21,10 +21,26 @@ public class SoundSampleUtil {
 
     public static int[] mutate(final int[] samples, final float volume, final float pitchChangeFactor) {
         final int[] newSamples = new int[(int) (samples.length / pitchChangeFactor)];
-        for (int i = 0; i < newSamples.length; i++) {
-            // Long to prevent clipping of the index
-            final long index = (long) i * samples.length / newSamples.length;
-            newSamples[i] = (int) (samples[(int) index] * volume);
+        if (pitchChangeFactor < 1) {
+            //Interpolate the samples for better quality
+            for (int i = 0; i < newSamples.length; i++) {
+                final float index = i * pitchChangeFactor;
+                final int lowerIndex = (int) index;
+                final int upperIndex = lowerIndex + 1;
+                final float fraction = index - lowerIndex;
+                if (upperIndex < samples.length) {
+                    newSamples[i] = (int) ((1 - fraction) * samples[lowerIndex] + fraction * samples[upperIndex]);
+                } else {
+                    newSamples[i] = samples[lowerIndex];
+                }
+                newSamples[i] = (int) (newSamples[i] * volume);
+            }
+        } else {
+            for (int i = 0; i < newSamples.length; i++) {
+                // Long to prevent clipping of the index
+                final long index = (long) i * samples.length / newSamples.length;
+                newSamples[i] = (int) (samples[(int) index] * volume);
+            }
         }
         return newSamples;
     }