Fixed DMXSound having wrong padding values. (Issue #19)

MTrop · Nov 22, 2023 · f64694c · f64694c
1 parent 8755db5
commit f64694c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -3,6 +3,12 @@ Doom Struct (C) 2015-2023
 by Matt Tropiano et al. (see AUTHORS.txt)
 
 
+Changed in 2.15.2
+-----------------
+
+- `Fixed` Proper padding values on DMX sound export. (Issue #19)
+
+
 Changed in 2.15.1
 -----------------
 

diff --git a/src/main/java/net/mtrop/doom/sound/DMXSound.java b/src/main/java/net/mtrop/doom/sound/DMXSound.java
@@ -331,21 +331,23 @@ public void readBytes(InputStream in) throws IOException
 	@Override
 	public void writeBytes(OutputStream out) throws IOException
 	{
-		final byte[] PADDING = new byte[]{
-				0x7F, 0x7F, 0x7F, 0x7F,
-				0x7F, 0x7F, 0x7F, 0x7F,
-				0x7F, 0x7F, 0x7F, 0x7F,
-				0x7F, 0x7F, 0x7F, 0x7F
-			};
 		SerialWriter sw = new SerialWriter(SerialWriter.LITTLE_ENDIAN);
 		sw.writeUnsignedShort(out, 3); // format type
 		sw.writeUnsignedShort(out, sampleRate);
-		sw.writeUnsignedInteger(out, sampleCount + (PADDING.length * 2));
+		sw.writeUnsignedInteger(out, sampleCount + (16 * 2)); // padding is 2 sets of 16 bytes
+
+		byte[] PAD = new byte[16];
+
+		Arrays.fill(PAD, (byte)(getSampleUnsignedByte(0) & 0x0ff));
+
+		sw.writeBytes(out, PAD);
 
-		sw.writeBytes(out, PADDING);
 		for (int i = 0; i < sampleCount; i++)
 			sw.writeUnsignedByte(out, getSampleUnsignedByte(i));
-		sw.writeBytes(out, PADDING);
+
+		Arrays.fill(PAD, (byte)(getSampleUnsignedByte(sampleCount - 1) & 0x0ff));
+
+		sw.writeBytes(out, PAD);
 	}
 
 	@Override