Seil0/teapod
Seil0
/
teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

update ExoPlayer 

exoplayer 2.15.0 -> 2.17.1
This commit is contained in:
Jannik 2022-04-02 19:47:49 +02:00
parent e97ad9a245
commit 7a860a7270
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/mosad/teapod/ui/activity/player/PlayerViewModel.kt
View File

@ -31,11 +31,7 @@ import androidx.lifecycle.viewModelScope
import com.google.android.exoplayer2.ExoPlayer import com.google.android.exoplayer2.ExoPlayer
import com.google.android.exoplayer2.MediaItem import com.google.android.exoplayer2.MediaItem
import com.google.android.exoplayer2.Player import com.google.android.exoplayer2.Player
import com.google.android.exoplayer2.SimpleExoPlayer
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
import com.google.android.exoplayer2.source.hls.HlsMediaSource
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
import com.google.android.exoplayer2.util.Util
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.joinAll import kotlinx.coroutines.joinAll
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -60,8 +56,7 @@ import java.util.*
class PlayerViewModel(application: Application) : AndroidViewModel(application) { class PlayerViewModel(application: Application) : AndroidViewModel(application) {
private val classTag = javaClass.name private val classTag = javaClass.name
val player = SimpleExoPlayer.Builder(application).build() val player = ExoPlayer.Builder(application).build()
private val dataSourceFactory = DefaultDataSourceFactory(application, Util.getUserAgent(application, "Teapod"))
private val mediaSession = MediaSessionCompat(application, "TEAPOD_PLAYER_SESSION") private val mediaSession = MediaSessionCompat(application, "TEAPOD_PLAYER_SESSION")
val currentEpisodeChangedListener = ArrayList<() -> Unit>() val currentEpisodeChangedListener = ArrayList<() -> Unit>()
@ -196,7 +191,7 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
} }
) )
} }
Log.i(classTag, "playback: ${currentEpisode.playback}") Log.d(classTag, "playback: ${currentEpisode.playback}")
if (startPlayback) { if (startPlayback) {
playCurrentMedia() playCurrentMedia()
@ -226,16 +221,13 @@ class PlayerViewModel(application: Application) : AndroidViewModel(application)
currentPlayback.streams.adaptive_hls.entries.first().value.url currentPlayback.streams.adaptive_hls.entries.first().value.url
} }
} }
Log.d(classTag, "stream url: $url") Log.i(classTag, "stream url: $url")
// create the media source object // create the media item
val mediaSource = HlsMediaSource.Factory(dataSourceFactory).createMediaSource( val mediaItem = MediaItem.fromUri(Uri.parse(url))
MediaItem.fromUri(Uri.parse(url)) player.setMediaItem(mediaItem)
)
// the actual player playback code
player.setMediaSource(mediaSource)
player.prepare() player.prepare()
if (seekPosition > 0) player.seekTo(seekPosition) if (seekPosition > 0) player.seekTo(seekPosition)
player.playWhenReady = true player.playWhenReady = true
} }

2
build.gradle
View File

@ -2,7 +2,7 @@
buildscript { buildscript {
ext.kotlin_version = "1.6.10" ext.kotlin_version = "1.6.10"
ext.ktor_version = "1.6.8" ext.ktor_version = "1.6.8"
ext.exo_version = "2.15.0" ext.exo_version = "2.17.1"
repositories { repositories {
google() google()
mavenCentral() mavenCentral()