Fix duplicated action issue found in test

tidal-music · Jun 24, 2024 · dcd1e02 · dcd1e02
1 parent 73df46e
commit dcd1e02
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/...ack-engine/src/main/kotlin/com/tidal/sdk/player/playbackengine/ExoPlayerPlaybackEngine.kt b/...ack-engine/src/main/kotlin/com/tidal/sdk/player/playbackengine/ExoPlayerPlaybackEngine.kt
@@ -460,7 +460,7 @@ internal class ExoPlayerPlaybackEngine(
         } else {
             Action.Type.PLAYBACK_STOP
         }
-        currentPlaybackSession?.actions?.add(
+        currentPlaybackSession?.tryAddAction(
             Action(
                 trueTimeWrapper.currentTimeMillis,
                 positionInSeconds,
@@ -594,9 +594,15 @@ internal class ExoPlayerPlaybackEngine(
                     }.toDouble() / MS_IN_SECOND
                 startStall(Stall.Reason.SEEK, stallPositionSeconds, invokedAtMillis)
             }
-            currentPlaybackSession?.actions?.apply {
-                add(Action(invokedAtMillis, oldPositionSeconds, Action.Type.PLAYBACK_STOP))
-                add(Action(invokedAtMillis, newPositionSeconds, Action.Type.PLAYBACK_START))
+            currentPlaybackSession?.apply {
+                tryAddAction(Action(invokedAtMillis, oldPositionSeconds, Action.Type.PLAYBACK_STOP))
+                tryAddAction(
+                    Action(
+                        invokedAtMillis,
+                        newPositionSeconds,
+                        Action.Type.PLAYBACK_START,
+                    ),
+                )
             }
         }
     }
@@ -674,7 +680,7 @@ internal class ExoPlayerPlaybackEngine(
         } else {
             eventTime.currentPlaybackPositionMs
         }.toDouble() / MS_IN_SECOND
-        currentPlaybackSession?.actions?.add(
+        currentPlaybackSession?.tryAddAction(
             Action(
                 trueTimeWrapper.currentTimeMillis,
                 positionInSeconds,

diff --git a/...otlin/com/tidal/sdk/player/playbackengine/mediasource/streamingsession/PlaybackSession.kt b/...otlin/com/tidal/sdk/player/playbackengine/mediasource/streamingsession/PlaybackSession.kt
@@ -17,14 +17,25 @@ internal sealed class PlaybackSession {
     abstract val actualQuality: ProductQuality
     abstract val sourceType: String?
     abstract val sourceId: String?
-    abstract val actions: MutableList<Action>
+    val actions: List<Action> = mutableListOf()
 
     var startTimestamp = 0L
     var startAssetPosition by
         Delegates.vetoable(START_ASSET_POSITION_UNASSIGNED) { _, oldValue, newValue ->
             oldValue == START_ASSET_POSITION_UNASSIGNED && newValue >= 0
         }
 
+    fun tryAddAction(action: Action) {
+        if (actions.lastOrNull()?.actionType == action.actionType) {
+            /**
+             * PlayLog-wise, we can't start while started or stop while stopped. However,
+             * ExoPlayer-wise, it can happen for example when a discontinuity occurs while paused.
+             */
+            return
+        }
+        (actions as MutableList<Action>).add(action)
+    }
+
     @Suppress("LongParameterList")
     class Audio(
         override val playbackSessionId: UUID,
@@ -35,10 +46,7 @@ internal sealed class PlaybackSession {
         override val actualQuality: AudioQuality,
         override val sourceType: String?,
         override val sourceId: String?,
-    ) : PlaybackSession() {
-
-        override val actions = mutableListOf<Action>()
-    }
+    ) : PlaybackSession()
 
     @Suppress("LongParameterList")
     class Video(
@@ -49,10 +57,7 @@ internal sealed class PlaybackSession {
         override val actualQuality: VideoQuality,
         override val sourceType: String?,
         override val sourceId: String?,
-    ) : PlaybackSession() {
-
-        override val actions = mutableListOf<Action>()
-    }
+    ) : PlaybackSession()
 
     class Broadcast(
         override val playbackSessionId: UUID,
@@ -61,10 +66,7 @@ internal sealed class PlaybackSession {
         override val actualQuality: AudioQuality,
         override val sourceType: String?,
         override val sourceId: String?,
-    ) : PlaybackSession() {
-
-        override val actions = mutableListOf<Action>()
-    }
+    ) : PlaybackSession()
 
     @Suppress("LongParameterList")
     class UC(
@@ -76,7 +78,6 @@ internal sealed class PlaybackSession {
     ) : PlaybackSession() {
 
         override val actualQuality = AudioQuality.LOW
-        override val actions = mutableListOf<Action>()
     }
 
     companion object {