kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 06:10:31 +05:30
Code Issues Projects Releases Wiki Activity

feat: allow dash without piped proxy (#6485)

Browse Source
This commit is contained in:
Jānis 2024-09-14 12:59:21 +03:00 committed by GitHub
parent bbdaf3285d
commit b29d4c6fd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
View File

@ -374,7 +374,7 @@ class OnlinePlayerService : LifecycleService() {
val streams = streams ?: return val streams = streams ?: return
val (uri, mimeType) = val (uri, mimeType) =
if (!PlayerHelper.useHlsOverDash && streams.audioStreams.isNotEmpty() && !PlayerHelper.disablePipedProxy) { if (!PlayerHelper.useHlsOverDash && streams.audioStreams.isNotEmpty()) {
PlayerHelper.createDashSource(streams, this) to MimeTypes.APPLICATION_MPD PlayerHelper.createDashSource(streams, this) to MimeTypes.APPLICATION_MPD
} else { } else {
ProxyHelper.unwrapStreamUrl(streams.hls.orEmpty()) ProxyHelper.unwrapStreamUrl(streams.hls.orEmpty())

2
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -1308,7 +1308,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
lbryHlsUrl.toUri() to MimeTypes.APPLICATION_M3U8 lbryHlsUrl.toUri() to MimeTypes.APPLICATION_M3U8
} }
// DASH // DASH
!PlayerHelper.useHlsOverDash && streams.videoStreams.isNotEmpty() && !PlayerHelper.disablePipedProxy -> { !PlayerHelper.useHlsOverDash && streams.videoStreams.isNotEmpty() -> {
// only use the dash manifest generated by YT if either it's a livestream or no other source is available // only use the dash manifest generated by YT if either it's a livestream or no other source is available
val dashUri = val dashUri =
if (streams.livestream && streams.dash != null) { if (streams.livestream && streams.dash != null) {