beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Re-add fallback to audio/mp4

Browse source
This commit is contained in:
vfsfitvnm 2022-07-12 22:30:31 +02:00
parent ee2410b289
commit 927a6f1321
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
View file

@ -1,6 +1,9 @@
package it.vfsfitvnm.vimusic.service package it.vfsfitvnm.vimusic.service
import android.app.* import android.app.Notification
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
import android.content.* import android.content.*
import android.content.res.Configuration import android.content.res.Configuration
import android.graphics.Color import android.graphics.Color
@ -22,11 +25,7 @@ import androidx.media3.database.StandaloneDatabaseProvider
import androidx.media3.datasource.DataSource import androidx.media3.datasource.DataSource
import androidx.media3.datasource.DefaultHttpDataSource import androidx.media3.datasource.DefaultHttpDataSource
import androidx.media3.datasource.ResolvingDataSource import androidx.media3.datasource.ResolvingDataSource
import androidx.media3.datasource.cache.Cache import androidx.media3.datasource.cache.*
import androidx.media3.datasource.cache.CacheDataSource
import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
import androidx.media3.datasource.cache.NoOpCacheEvictor
import androidx.media3.datasource.cache.SimpleCache
import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.exoplayer.RenderersFactory import androidx.media3.exoplayer.RenderersFactory
import androidx.media3.exoplayer.analytics.AnalyticsListener import androidx.media3.exoplayer.analytics.AnalyticsListener
@ -39,6 +38,7 @@ import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
import androidx.media3.exoplayer.source.MediaSource import androidx.media3.exoplayer.source.MediaSource
import androidx.media3.extractor.ExtractorsFactory import androidx.media3.extractor.ExtractorsFactory
import androidx.media3.extractor.mkv.MatroskaExtractor import androidx.media3.extractor.mkv.MatroskaExtractor
import androidx.media3.extractor.mp4.FragmentedMp4Extractor
import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.Database
import it.vfsfitvnm.vimusic.MainActivity import it.vfsfitvnm.vimusic.MainActivity
import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.R
@ -494,7 +494,7 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
when (val status = body.playabilityStatus.status) { when (val status = body.playabilityStatus.status) {
"OK" -> body.streamingData?.adaptiveFormats?.findLast { format -> "OK" -> body.streamingData?.adaptiveFormats?.findLast { format ->
format.itag == 251 format.itag == 251 || format.itag == 140
}?.let { format -> }?.let { format ->
val mediaItem = runBlocking(Dispatchers.Main) { val mediaItem = runBlocking(Dispatchers.Main) {
player.findNextMediaItemById(videoId) player.findNextMediaItemById(videoId)
@ -551,7 +551,7 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
private fun createExtractorsFactory(): ExtractorsFactory { private fun createExtractorsFactory(): ExtractorsFactory {
return ExtractorsFactory { return ExtractorsFactory {
arrayOf(MatroskaExtractor()) arrayOf(MatroskaExtractor(), FragmentedMp4Extractor())
} }
} }