From 4aee2c35a14fee798eeca324e10e6b479a35095d Mon Sep 17 00:00:00 2001 From: Bnyro Date: Wed, 16 Nov 2022 19:11:07 +0100 Subject: [PATCH] remove the limit HLS pref as HLS now follows the default resolution --- .../github/libretube/constants/PreferenceKeys.kt | 1 - .../libretube/ui/fragments/PlayerFragment.kt | 16 +++------------- app/src/main/res/xml/audio_video_settings.xml | 6 ------ 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt b/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt index a46100d37..ac20cc559 100644 --- a/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt +++ b/app/src/main/java/com/github/libretube/constants/PreferenceKeys.kt @@ -78,7 +78,6 @@ object PreferenceKeys { const val PLAYER_RESIZE_MODE = "player_resize_mode" const val SB_SKIP_MANUALLY = "sb_skip_manually_key" const val SB_SHOW_MARKERS = "sb_show_markers" - const val LIMIT_HLS = "limit_hls" const val PROGRESSIVE_LOADING_INTERVAL_SIZE = "progressive_loading_interval" const val ALTERNATIVE_PLAYER_LAYOUT = "alternative_player_layout" const val USE_HLS_OVER_DASH = "use_hls" 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 index a9325f397..ef913c0dc 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt @@ -1102,7 +1102,9 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions { if (resolutions.any { it.resolution == vid.quality.toString().split("p").first().toInt() } - ) continue + ) { + continue + } resolutions.add( VideoResolution( @@ -1228,18 +1230,6 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions { ) trackSelector.setParameters(params) - // limit hls to full hd - if ( - PreferenceHelper.getBoolean( - PreferenceKeys.LIMIT_HLS, - false - ) - ) { - val newParams = trackSelector.buildUponParameters() - .setMaxVideoSize(1920, 1080) - trackSelector.setParameters(newParams) - } - exoPlayer = ExoPlayer.Builder(requireContext()) .setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory)) .setLoadControl(loadControl) diff --git a/app/src/main/res/xml/audio_video_settings.xml b/app/src/main/res/xml/audio_video_settings.xml index fdeb60a2c..ee98f808f 100644 --- a/app/src/main/res/xml/audio_video_settings.xml +++ b/app/src/main/res/xml/audio_video_settings.xml @@ -76,12 +76,6 @@ android:title="@string/hls_instead_of_dash" app:key="use_hls" /> - -