Never report audio progress beyond duration (#531)

readium · Jun 10, 2024 · 636e1fd · 636e1fd
1 parent acac9b4
commit 636e1fd
Showing 1 changed file with 23 additions and 5 deletions.
diff --git a/.../navigators/media/audio/src/main/java/org/readium/navigator/media/audio/AudioNavigator.kt b/.../navigators/media/audio/src/main/java/org/readium/navigator/media/audio/AudioNavigator.kt
@@ -91,36 +91,47 @@ public class AudioNavigator<S : Configurable.Settings, P : Configurable.Preferen
                 .mapNotNull { it.duration }
                 .takeIf { it.size == readingOrder.items.size }
                 ?.sum()
+
+            val coercedOffset =
+                playback.coerceOffset(currentItem.duration)
+
             val totalProgression =
                 if (itemStartPosition == null) {
                     null
                 } else {
-                    readingOrder.duration?.let { (itemStartPosition + playback.offset) / it }
+                    readingOrder.duration?.let { (itemStartPosition + coercedOffset) / it }
                 }
 
             val locator = requireNotNull(publication.locatorFromLink(link))
             locator.copyWithLocations(
-                fragments = listOf("t=${playback.offset.inWholeSeconds}"),
-                progression = item.duration?.let { playback.offset / it },
+                fragments = listOf("t=${coercedOffset.inWholeSeconds}"),
+                progression = item.duration?.let { coercedOffset / it },
                 totalProgression = totalProgression
             )
         }
 
     override val playback: StateFlow<Playback> =
         audioEngine.playback.mapStateIn(coroutineScope) { playback ->
+            val itemDuration =
+                readingOrder.items[playback.index].duration
+
+            val coercedOffset =
+                playback.coerceOffset(itemDuration)
+
             Playback(
                 playback.state.toState(),
                 playback.playWhenReady,
                 playback.index,
-                playback.offset,
+                coercedOffset,
                 playback.buffered
             )
         }
 
     override val location: StateFlow<Location> =
         audioEngine.playback.mapStateIn(coroutineScope) {
             val currentItem = readingOrder.items[it.index]
-            Location(currentItem.href, it.offset)
+            val coercedOffset = it.coerceOffset(currentItem.duration)
+            Location(currentItem.href, coercedOffset)
         }
 
     override fun play() {
@@ -178,4 +189,11 @@ public class AudioNavigator<S : Configurable.Settings, P : Configurable.Preferen
             is AudioEngine.State.Buffering -> State.Buffering
             is AudioEngine.State.Failure -> State.Failure(error)
         }
+
+    private fun AudioEngine.Playback.coerceOffset(duration: Duration?): Duration =
+        if (duration == null) {
+            offset
+        } else {
+            offset.coerceAtMost(duration)
+        }
 }