jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve PlaybackTicker

This commit is contained in:
Florian Renaud 2022-11-04 23:21:18 +01:00
parent a47e3c1233
commit b2f35fa135
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AudioMessagePlaybackTracker.kt
View File

@ -127,7 +127,7 @@ class AudioMessagePlaybackTracker @Inject constructor() {
} }
} }
private fun getPercentage(id: String): Float { fun getPercentage(id: String): Float {
return when (val state = states[id]) { return when (val state = states[id]) {
is Listener.State.Playing -> state.percentage is Listener.State.Playing -> state.percentage
is Listener.State.Paused -> state.percentage is Listener.State.Paused -> state.percentage

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

@ -340,34 +340,37 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
onPlaybackTick(id) onPlaybackTick(id)
} }
private fun onPlaybackTick(id: String) {
if (currentMediaPlayer?.isPlaying.orFalse()) {
val itemStartPosition = playlist.currentItem?.startTime
val currentVoiceBroadcastPosition = itemStartPosition?.plus(currentMediaPlayer?.currentPosition ?: 0)
Timber.d("Voice Broadcast | VoiceBroadcastPlayerImpl - sequence: ${playlist.currentSequence}, itemStartPosition $itemStartPosition, currentMediaPlayer=$currentMediaPlayer, currentMediaPlayer?.currentPosition: ${currentMediaPlayer?.currentPosition}")
if (currentVoiceBroadcastPosition != null) {
val percentage = currentVoiceBroadcastPosition.toFloat() / playlist.duration
playbackTracker.updatePlayingAtPlaybackTime(id, currentVoiceBroadcastPosition, percentage)
} else {
stopPlaybackTicker(id)
}
} else {
stopPlaybackTicker(id)
}
}
fun stopPlaybackTicker(id: String) { fun stopPlaybackTicker(id: String) {
playbackTicker?.stop() playbackTicker?.stop()
playbackTicker = null playbackTicker = null
onPlaybackTick(id)
}
val totalDuration = playlist.duration private fun onPlaybackTick(id: String) {
if (totalDuration > 0) { val currentItem = playlist.currentItem ?: return
val playbackTime = playbackTracker.getPlaybackTime(id) val itemStartTime = currentItem.startTime
val remainingTime = totalDuration - playbackTime val duration = playlist.duration
if (remainingTime < 1000) { when (playingState) {
playbackTracker.updatePausedAtPlaybackTime(id, 0, 0f) State.PLAYING,
} else { State.PAUSED -> {
playbackTracker.pausePlayback(id) Timber.d("Voice Broadcast | VoiceBroadcastPlayerImpl - sequence: ${playlist.currentSequence}, itemStartTime $itemStartTime, currentMediaPlayer=$currentMediaPlayer, currentMediaPlayer?.currentPosition: ${currentMediaPlayer?.currentPosition}")
val position = itemStartTime + (currentMediaPlayer?.currentPosition ?: 0)
val percentage = position.toFloat() / playlist.duration
if (playingState == State.PLAYING) {
playbackTracker.updatePlayingAtPlaybackTime(id, position, percentage)
} else {
playbackTracker.updatePausedAtPlaybackTime(id, position, percentage)
}
}
State.BUFFERING,
State.IDLE -> {
val playbackTime = playbackTracker.getPlaybackTime(id)
val percentage = playbackTracker.getPercentage(id)
if (playingState == State.IDLE && duration > 0 && (duration - playbackTime) < 1000) {
playbackTracker.updatePausedAtPlaybackTime(id, 0, 0f)
} else {
playbackTracker.updatePausedAtPlaybackTime(id, playbackTime, percentage)
}
} }
} }
} }