filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle the potential offset on the chunk position used by the media player

Browse Source
This commit is contained in:
Florian Renaud 2023-01-31 10:14:28 +01:00
parent a0ab6de85a
commit f74c7fa997
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt
View File

@ -223,28 +223,32 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
} }
} }
private fun startPlayback(position: Int) { private fun startPlayback(playbackPosition: Int) {
stopPlayer() stopPlayer()
playingState = State.Buffering playingState = State.Buffering
val playlistItem = playlist.findByPosition(position) ?: run { val playlistItem = playlist.findByPosition(playbackPosition) ?: run {
Timber.w("## Voice Broadcast | No content to play at position $position"); stop(); return Timber.w("## Voice Broadcast | No content to play at position $playbackPosition"); stop(); return
} }
val sequence = playlistItem.sequence ?: run { val sequence = playlistItem.sequence ?: run {
Timber.w("## Voice Broadcast | Playlist item has no sequence"); stop(); return Timber.w("## Voice Broadcast | Playlist item has no sequence"); stop(); return
} }
val sequencePosition = position - playlistItem.startTime
currentVoiceBroadcast?.let { currentVoiceBroadcast?.let {
val percentage = tryOrNull { position.toFloat() / playlist.duration } ?: 0f val percentage = tryOrNull { playbackPosition.toFloat() / playlist.duration } ?: 0f
playbackTracker.updatePausedAtPlaybackTime(it.voiceBroadcastId, position, percentage) playbackTracker.updatePausedAtPlaybackTime(it.voiceBroadcastId, playbackPosition, percentage)
} }
prepareCurrentPlayerJob = sessionScope.launch { prepareCurrentPlayerJob = sessionScope.launch {
try { try {
val mp = prepareMediaPlayer(playlistItem.audioEvent.content) val mp = prepareMediaPlayer(playlistItem.audioEvent.content)
playlist.currentSequence = sequence - 1 // will be incremented in onNextMediaPlayerStarted
// Take the difference between the duration given from the media player and the duration given from the chunk event
// If the offset is smaller than 500ms, we consider there is no offset to keep the normal behaviour
val offset = (mp.duration - playlistItem.duration).takeUnless { it < 500 }?.coerceAtLeast(0) ?: 0
val sequencePosition = offset + (playbackPosition - playlistItem.startTime)
playlist.currentSequence = sequence - 1 // will be incremented in onNextMediaPlayerStarted
mp.start() mp.start()
if (sequencePosition > 0) { if (sequencePosition > 0) {
mp.seekTo(sequencePosition) mp.seekTo(sequencePosition)

4
vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlaylist.kt
View File

@ -65,6 +65,6 @@ class VoiceBroadcastPlaylist(
} }
data class PlaylistItem(val audioEvent: MessageAudioEvent, val startTime: Int) { data class PlaylistItem(val audioEvent: MessageAudioEvent, val startTime: Int) {
val sequence: Int? val sequence: Int? = audioEvent.sequence
get() = audioEvent.sequence val duration: Int = audioEvent.duration
} }