Fixed sounds always being loaded as 16 bit

RaphiMC · May 8, 2024 · 6153578 · 6153578
1 parent 9097d53
commit 6153578
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/src/main/java/net/raphimc/noteblocktool/audio/export/impl/JavaxAudioExporter.java b/src/main/java/net/raphimc/noteblocktool/audio/export/impl/JavaxAudioExporter.java
@@ -105,9 +105,20 @@ private int[] readSound(final AudioFormat format, final InputStream is) {
             final int sampleSize = format.getSampleSizeInBits() / 8;
             final int[] samples = new int[audioBytes.length / sampleSize];
             for (int i = 0; i < samples.length; i++) {
-                final byte[] sampleBytes = new byte[sampleSize];
-                System.arraycopy(audioBytes, i * sampleSize, sampleBytes, 0, sampleSize);
-                samples[i] = ByteBuffer.wrap(sampleBytes).order(ByteOrder.LITTLE_ENDIAN).getShort();
+                ByteBuffer buffer = ByteBuffer.wrap(audioBytes, i * sampleSize, sampleSize).order(ByteOrder.LITTLE_ENDIAN);
+                switch (format.getSampleSizeInBits()) {
+                    case 8:
+                        samples[i] = buffer.get();
+                        break;
+                    case 16:
+                        samples[i] = buffer.getShort();
+                        break;
+                    case 32:
+                        samples[i] = buffer.getInt();
+                        break;
+                    default:
+                        throw new UnsupportedOperationException("Unsupported sample size: " + format.getSampleSizeInBits());
+                }
             }
 
             return samples;

diff --git a/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/JavaxSoundSystem.java b/src/main/java/net/raphimc/noteblocktool/audio/soundsystem/JavaxSoundSystem.java
@@ -103,9 +103,20 @@ private static int[] readSound(final InputStream is) {
             final int sampleSize = FORMAT.getSampleSizeInBits() / 8;
             final int[] samples = new int[audioBytes.length / sampleSize];
             for (int i = 0; i < samples.length; i++) {
-                final byte[] sampleBytes = new byte[sampleSize];
-                System.arraycopy(audioBytes, i * sampleSize, sampleBytes, 0, sampleSize);
-                samples[i] = ByteBuffer.wrap(sampleBytes).order(ByteOrder.LITTLE_ENDIAN).getShort();
+                ByteBuffer buffer = ByteBuffer.wrap(audioBytes, i * sampleSize, sampleSize).order(ByteOrder.LITTLE_ENDIAN);
+                switch (FORMAT.getSampleSizeInBits()) {
+                    case 8:
+                        samples[i] = buffer.get();
+                        break;
+                    case 16:
+                        samples[i] = buffer.getShort();
+                        break;
+                    case 32:
+                        samples[i] = buffer.getInt();
+                        break;
+                    default:
+                        throw new UnsupportedOperationException("Unsupported sample size: " + FORMAT.getSampleSizeInBits());
+                }
             }
 
             return samples;