Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reenable constant bitrate seeking

Browse source 
Turns out it didnt fix the problem, was probably some fluke bug or bit flip.
This commit is contained in:
OxygenCobalt 2021-01-19 11:52:22 -07:00
parent 2c435b25a7
commit 942e1fc740
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
3 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/org/oxycblt/auxio/playback/PlaybackService.kt
View file

@ -31,7 +31,9 @@ import com.google.android.exoplayer2.SimpleExoPlayer
import com.google.android.exoplayer2.audio.AudioAttributes import com.google.android.exoplayer2.audio.AudioAttributes
import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory
import com.google.android.exoplayer2.mediacodec.MediaCodecSelector import com.google.android.exoplayer2.mediacodec.MediaCodecSelector
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
@ -222,6 +224,10 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
} }
} }
override fun onIsPlayingChanged(isPlaying: Boolean) {
logD(isPlaying.toString())
}
// --- PLAYBACK STATE CALLBACK OVERRIDES --- // --- PLAYBACK STATE CALLBACK OVERRIDES ---
override fun onSongUpdate(song: Song?) { override fun onSongUpdate(song: Song?) {
@ -347,7 +353,10 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
) )
} }
val extractorsFactory = DefaultExtractorsFactory().setConstantBitrateSeekingEnabled(true)
return SimpleExoPlayer.Builder(this, audioRenderer) return SimpleExoPlayer.Builder(this, audioRenderer)
.setMediaSourceFactory(DefaultMediaSourceFactory(this, extractorsFactory))
.build() .build()
} }
@ -479,7 +488,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
// Play/Pause if any of the keys are play/pause // Play/Pause if any of the keys are play/pause
KeyEvent.KEYCODE_MEDIA_PAUSE, KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_MEDIA_PAUSE, KeyEvent.KEYCODE_MEDIA_PLAY,
KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_HEADSETHOOK -> { KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_HEADSETHOOK -> {
playbackManager.setPlaying(!playbackManager.isPlaying) playbackManager.setPlayingStatus(!playbackManager.isPlaying)
true true
} }
@ -552,7 +561,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
player.volume = VOLUME_DUCK player.volume = VOLUME_DUCK
animateVolume(VOLUME_DUCK, VOLUME_FULL) animateVolume(VOLUME_DUCK, VOLUME_FULL)
} else if (pauseWasFromAudioFocus) { } else if (pauseWasFromAudioFocus) {
playbackManager.setPlaying(true) playbackManager.setPlayingStatus(true)
} }
pauseWasFromAudioFocus = false pauseWasFromAudioFocus = false
@ -562,7 +571,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
private fun onLoss() { private fun onLoss() {
if (settingsManager.doAudioFocus && playbackManager.isPlaying) { if (settingsManager.doAudioFocus && playbackManager.isPlaying) {
pauseWasFromAudioFocus = true pauseWasFromAudioFocus = true
playbackManager.setPlaying(false) playbackManager.setPlayingStatus(false)
} }
} }
@ -604,7 +613,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
playbackManager.setShuffling(!playbackManager.isShuffling, keepSong = true) playbackManager.setShuffling(!playbackManager.isShuffling, keepSong = true)
NotificationUtils.ACTION_SKIP_PREV -> playbackManager.prev() NotificationUtils.ACTION_SKIP_PREV -> playbackManager.prev()
NotificationUtils.ACTION_PLAY_PAUSE -> { NotificationUtils.ACTION_PLAY_PAUSE -> {
playbackManager.setPlaying(!playbackManager.isPlaying) playbackManager.setPlayingStatus(!playbackManager.isPlaying)
} }
NotificationUtils.ACTION_SKIP_NEXT -> playbackManager.next() NotificationUtils.ACTION_SKIP_NEXT -> playbackManager.next()
NotificationUtils.ACTION_EXIT -> stop() NotificationUtils.ACTION_EXIT -> stop()
@ -638,7 +647,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
if (playbackManager.song != null && settingsManager.doPlugMgt) { if (playbackManager.song != null && settingsManager.doPlugMgt) {
logD("Device connected, resuming...") logD("Device connected, resuming...")
playbackManager.setPlaying(true) playbackManager.setPlayingStatus(true)
} }
} }
@ -649,7 +658,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
if (playbackManager.song != null && settingsManager.doPlugMgt) { if (playbackManager.song != null && settingsManager.doPlugMgt) {
logD("Device disconnected, pausing...") logD("Device disconnected, pausing...")
playbackManager.setPlaying(false) playbackManager.setPlayingStatus(false)
} }
} }
@ -657,7 +666,7 @@ class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Ca
* Stop if the X button was clicked from the notification * Stop if the X button was clicked from the notification
*/ */
private fun stop() { private fun stop() {
playbackManager.setPlaying(false) playbackManager.setPlayingStatus(false)
stopForegroundAndNotification() stopForegroundAndNotification()
} }
} }

2
app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt
View file

@ -281,7 +281,7 @@ class PlaybackViewModel : ViewModel(), PlaybackStateManager.Callback {
fun invertPlayingStatus() { fun invertPlayingStatus() {
enableAnimation() enableAnimation()
playbackManager.setPlaying(!playbackManager.isPlaying) playbackManager.setPlayingStatus(!playbackManager.isPlaying)
} }
/** Flip the shuffle status, e.g from on to off. Will keep song by default. */ /** Flip the shuffle status, e.g from on to off. Will keep song by default. */

8
app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
View file

@ -246,7 +246,7 @@ class PlaybackStateManager private constructor() {
mPosition = 0 mPosition = 0
if (!mIsPlaying) { if (!mIsPlaying) {
setPlaying(true) setPlayingStatus(true)
} }
} }
@ -344,7 +344,7 @@ class PlaybackStateManager private constructor() {
mSong = mQueue[0] mSong = mQueue[0]
mPosition = 0 mPosition = 0
setPlaying(false) setPlayingStatus(false)
mIsInUserQueue = false mIsInUserQueue = false
} }
@ -576,7 +576,7 @@ class PlaybackStateManager private constructor() {
* Set the current playing status * Set the current playing status
* @param value Whether the playback should be playing or paused. * @param value Whether the playback should be playing or paused.
*/ */
fun setPlaying(value: Boolean) { fun setPlayingStatus(value: Boolean) {
if (mIsPlaying != value) { if (mIsPlaying != value) {
if (value) { if (value) {
mHasPlayed = true mHasPlayed = true
@ -591,7 +591,7 @@ class PlaybackStateManager private constructor() {
*/ */
fun rewind() { fun rewind() {
seekTo(0) seekTo(0)
setPlaying(true) setPlayingStatus(true)
} }
/** /**