kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 23:40:33 +05:30
Code Issues Projects Releases Wiki Activity

fix: missing item metadata when playing download containing video AND audio

Browse Source
This commit is contained in:
Bnyro 2025-04-08 17:32:13 +02:00
parent 50c2e18829
commit 9a09a384bd
No known key found for this signature in database
1 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
app/src/main/java/com/github/libretube/services/OfflinePlayerService.kt
View File

@ -10,6 +10,7 @@ import androidx.media3.common.MimeTypes
import androidx.media3.common.Player import androidx.media3.common.Player
import androidx.media3.common.util.UnstableApi import androidx.media3.common.util.UnstableApi
import androidx.media3.datasource.FileDataSource import androidx.media3.datasource.FileDataSource
import androidx.media3.exoplayer.source.MediaSource
import androidx.media3.exoplayer.source.MergingMediaSource import androidx.media3.exoplayer.source.MergingMediaSource
import androidx.media3.exoplayer.source.ProgressiveMediaSource import androidx.media3.exoplayer.source.ProgressiveMediaSource
import androidx.media3.exoplayer.source.SingleSampleMediaSource import androidx.media3.exoplayer.source.SingleSampleMediaSource
@ -58,7 +59,8 @@ open class OfflinePlayerService : AbstractPlayerService() {
if (playbackState == Player.STATE_READY) { if (playbackState == Player.STATE_READY) {
scope.launch(Dispatchers.IO) { scope.launch(Dispatchers.IO) {
val watchHistoryItem = downloadWithItems?.download?.toStreamItem()?.toWatchHistoryItem(videoId) val watchHistoryItem =
downloadWithItems?.download?.toStreamItem()?.toWatchHistoryItem(videoId)
if (watchHistoryItem != null) { if (watchHistoryItem != null) {
DatabaseHelper.addToWatchHistory(watchHistoryItem) DatabaseHelper.addToWatchHistory(watchHistoryItem)
} }
@ -137,65 +139,54 @@ open class OfflinePlayerService : AbstractPlayerService() {
val videoUri = downloadFiles.firstOrNull { it.type == FileType.VIDEO }?.path?.toAndroidUri() val videoUri = downloadFiles.firstOrNull { it.type == FileType.VIDEO }?.path?.toAndroidUri()
val audioUri = downloadFiles.firstOrNull { it.type == FileType.AUDIO }?.path?.toAndroidUri() val audioUri = downloadFiles.firstOrNull { it.type == FileType.AUDIO }?.path?.toAndroidUri()
if (isAudioOnlyPlayer && audioUri == null) { val subtitleInfo = downloadFiles.firstOrNull { it.type == FileType.SUBTITLE }
val videoSource = videoUri?.let { videoUri ->
val videoItem = MediaItem.Builder()
.setUri(videoUri)
.setMetadata(downloadWithItems)
.build()
ProgressiveMediaSource.Factory(FileDataSource.Factory())
.createMediaSource(videoItem)
}
val audioSource = audioUri?.let { audioUri ->
val audioItem = MediaItem.Builder()
.setUri(audioUri)
.setMetadata(downloadWithItems)
.build()
ProgressiveMediaSource.Factory(FileDataSource.Factory())
.createMediaSource(audioItem)
}
val subtitleSource = subtitleInfo?.let { subtitleInfo ->
val subtitle = SubtitleConfiguration.Builder(subtitleInfo.path.toAndroidUri())
.setMimeType(MimeTypes.APPLICATION_TTML)
.setLanguage(subtitleInfo.language ?: "en")
.build()
SingleSampleMediaSource.Factory(FileDataSource.Factory())
.createMediaSource(subtitle, C.TIME_UNSET)
}
var mediaSource: MediaSource? = null
listOfNotNull(videoSource, audioSource, subtitleSource).forEach { source ->
mediaSource =
if (mediaSource == null) source else MergingMediaSource(mediaSource!!, source)
}
if (mediaSource == null || isAudioOnlyPlayer && audioSource == null) {
stopSelf() stopSelf()
return return
} }
val subtitleInfo = downloadFiles.firstOrNull { it.type == FileType.SUBTITLE } exoPlayer?.setMediaSource(mediaSource!!)
val subtitle = subtitleInfo?.let {
SubtitleConfiguration.Builder(it.path.toAndroidUri())
.setMimeType(MimeTypes.APPLICATION_TTML)
.setLanguage(it.language ?: "en")
.build()
}
when {
videoUri != null && audioUri != null -> {
val videoItem = MediaItem.Builder()
.setUri(videoUri)
.setMetadata(downloadWithItems)
.setSubtitleConfigurations(listOfNotNull(subtitle))
.build()
val videoSource = ProgressiveMediaSource.Factory(FileDataSource.Factory())
.createMediaSource(videoItem)
val audioSource = ProgressiveMediaSource.Factory(FileDataSource.Factory())
.createMediaSource(MediaItem.fromUri(audioUri))
var mediaSource = MergingMediaSource(audioSource, videoSource)
if (subtitle != null) {
val subtitleSource = SingleSampleMediaSource.Factory(FileDataSource.Factory())
.createMediaSource(subtitle, C.TIME_UNSET)
mediaSource = MergingMediaSource(mediaSource, subtitleSource)
}
exoPlayer?.setMediaSource(mediaSource)
}
videoUri != null -> exoPlayer?.setMediaItem(
MediaItem.Builder()
.setUri(videoUri)
.setMetadata(downloadWithItems)
.setSubtitleConfigurations(listOfNotNull(subtitle))
.build()
)
audioUri != null -> exoPlayer?.setMediaItem(
MediaItem.Builder()
.setUri(audioUri)
.setMetadata(downloadWithItems)
.setSubtitleConfigurations(listOfNotNull(subtitle))
.build()
)
}
trackSelector?.updateParameters { trackSelector?.updateParameters {
setPreferredTextRoleFlags(C.ROLE_FLAG_CAPTION) setPreferredTextRoleFlags(C.ROLE_FLAG_CAPTION)
setPreferredTextLanguage(subtitle?.language) setPreferredTextLanguage(subtitleInfo?.language ?: "en")
} }
} }