kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 00:10:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #3071 from Isira-Seneviratne/Simplify_resolutions

Browse Source 
Simplify resolution display in the player view.
This commit is contained in:
Bnyro 2023-02-14 11:23:59 +01:00 committed by GitHub
commit 71c7af18df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/libretube/obj/VideoResolution.kt
View File

@ -2,6 +2,5 @@ package com.github.libretube.obj
data class VideoResolution( data class VideoResolution(
val name: String, val name: String,
val resolution: Int? = null, val resolution: Int
val adaptiveSourceUrl: String? = null
) )

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

@ -1202,29 +1202,18 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
* Get all available player resolutions * Get all available player resolutions
*/ */
private fun getAvailableResolutions(): List<VideoResolution> { private fun getAvailableResolutions(): List<VideoResolution> {
val resolutions = exoPlayer.currentTracks.groups.asSequence().map { group -> val resolutions = exoPlayer.currentTracks.groups.asSequence()
.flatMap { group ->
(0 until group.length).map { (0 until group.length).map {
group.getTrackFormat(it).height group.getTrackFormat(it).height
} }
}.flatten()
.filter { it > 0 }
.sortedDescending()
.distinct()
return resolutions.map {
VideoResolution(
name = "${it}p",
resolution = it
)
}.toMutableList().also {
it.add(
0,
VideoResolution(
getString(R.string.auto_quality),
resolution = Int.MAX_VALUE
)
)
} }
.filter { it > 0 }
.map { VideoResolution("${it}p", it) }
.toSortedSet(compareByDescending { it.resolution })
resolutions.add(VideoResolution(getString(R.string.auto_quality), Int.MAX_VALUE))
return resolutions.toList()
} }
private fun setResolutionAndSubtitles() { private fun setResolutionAndSubtitles() {
@ -1366,9 +1355,7 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
if (currentQuality == it.resolution) "${it.name} ✓" else it.name if (currentQuality == it.resolution) "${it.name} ✓" else it.name
} }
) { which -> ) { which ->
resolutions[which].resolution?.let { setPlayerResolution(resolutions[which].resolution)
setPlayerResolution(it)
}
} }
.show(childFragmentManager) .show(childFragmentManager)
} }