word-align audio data, so it's size is never an odd number

Bible-Translation-Tools · Jun 6, 2024 · 79a124c · 79a124c
1 parent e6acf93
commit 79a124c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/common/audio/src/main/kotlin/org/wycliffeassociates/otter/common/audio/wav/CueChunk.kt b/common/audio/src/main/kotlin/org/wycliffeassociates/otter/common/audio/wav/CueChunk.kt
@@ -169,6 +169,9 @@ open class CueChunk : RiffChunk {
             .sum()
     }
 
+    private fun getWordAlignedLength(length: Int) =
+        if (length % DWORD_SIZE != 0) length + DWORD_SIZE - (length % DWORD_SIZE) else length
+
     private fun wordAlignedLabel(cue: AudioCue): ByteArray {
         val label = cue.label
         val alignedLength = getWordAlignedLength(cue.label.length)

diff --git a/common/audio/src/main/kotlin/org/wycliffeassociates/otter/common/audio/wav/WavFile.kt b/common/audio/src/main/kotlin/org/wycliffeassociates/otter/common/audio/wav/WavFile.kt
@@ -162,7 +162,7 @@ class WavFile private constructor() : AudioFormatStrategy {
                 val metadataSize = totalDataLength - nonMetadataSize
                 val bytes = ByteArray(metadataSize)
                 file.inputStream().use {
-                    val metadataStart = headerSize + getWordAlignedLength(totalAudioLength)
+                    val metadataStart = headerSize + wordAlign(totalAudioLength)
                     it.skip(metadataStart.toLong())
                     it.read(bytes)
                 }
@@ -197,6 +197,3 @@ class WavFile private constructor() : AudioFormatStrategy {
         return WavOutputStream(this, append, buffered)
     }
 }
-
-internal fun getWordAlignedLength(length: Int) =
-    if (length % WORD_SIZE != 0) length + WORD_SIZE - (length % WORD_SIZE) else length
diff --git a/common/audio/src/test/kotlin/org/wycliffeassociates/otter/common/audio/wav/CueChunkTest.kt b/common/audio/src/test/kotlin/org/wycliffeassociates/otter/common/audio/wav/CueChunkTest.kt
@@ -89,7 +89,7 @@ class CueChunkTest {
                 }
                 val os = WavOutputStream(wav)
                 os.use {
-                    os.write(ByteArray(writeSize))
+                    os.write(ByteArray(wordAlign(writeSize)))
                 }
                 val validator = WavFile(file, WavMetadata(listOf(CueChunk())))
                 val resultMetadata = validator.metadata