feat: allow dash without piped proxy (#6485)

janisslsm · web-flow · commit b29d4c6fd4c8 · 2024-09-14T11:59:21.000+02:00
diff --git a/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt b/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
@@ -374,7 +374,7 @@ class OnlinePlayerService : LifecycleService() {
         val streams = streams ?: return
 
         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
             } else {
                 ProxyHelper.unwrapStreamUrl(streams.hls.orEmpty())
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -1308,7 +1308,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
                 lbryHlsUrl.toUri() to MimeTypes.APPLICATION_M3U8
             }
             // 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
                 val dashUri =
                     if (streams.livestream && streams.dash != null) {

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