Word-align wav total audio length to correctly parse metadata

Bible-Translation-Tools · Jun 5, 2024 · e6acf93 · e6acf93
1 parent e7958ef
commit e6acf93
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/common/audio/build.gradle b/common/audio/build.gradle
@@ -1,5 +1,5 @@
 group = 'org.wycliffeassociates.otter.common'
-version = '0.4.2'
+version = '0.4.3'
 
 dependencies {
     testImplementation "junit:junit:$junitVer"

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,9 +169,6 @@ 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/RiffChunk.kt b/common/audio/src/main/kotlin/org/wycliffeassociates/otter/common/audio/wav/RiffChunk.kt
@@ -24,6 +24,7 @@ internal const val RIFF_HEADER_SIZE = 12
 internal const val CHUNK_HEADER_SIZE = 8
 internal const val CHUNK_LABEL_SIZE = 4
 internal const val DWORD_SIZE = 4
+internal const val WORD_SIZE = 2
 
 // chunk data must be word aligned but the size might not account for padding
 // therefore, if odd, the size we read must add one to include the padding

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 + totalAudioLength
+                    val metadataStart = headerSize + getWordAlignedLength(totalAudioLength)
                     it.skip(metadataStart.toLong())
                     it.read(bytes)
                 }
@@ -197,3 +197,6 @@ 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