Merge pull request #2633 from Bnyro/master

Reduce the amount of used data in background mode

app/src/main/java/com/github/libretube/enums/AudioQuality.kt

@@ -0,0 +1,6 @@
+package com.github.libretube.enums
+
+enum class AudioQuality {
+    BEST,
+    WORST
+}

app/src/main/java/com/github/libretube/services/BackgroundMode.kt

@@ -293,23 +293,24 @@ class BackgroundMode : Service() {
      * Sets the [MediaItem] with the [streams] into the [player]
      */
     private fun setMediaItem() {
-        streams?.let {
+        streams ?: return
-            val uri = if (streams!!.hls != null) {
+
-                streams!!.hls
+        val uri = if (streams!!.audioStreams.orEmpty().isNotEmpty()) {
-            } else if (streams!!.audioStreams!!.isNotEmpty()) {
             PlayerHelper.getAudioSource(
                 this,
                 streams!!.audioStreams!!
             )
+        } else if (streams!!.hls != null) {
+            streams!!.hls
         } else {
             return
         }
+
         val mediaItem = MediaItem.Builder()
             .setUri(uri)
             .build()
         player?.setMediaItem(mediaItem)
     }
-    }
 
     /**
      * fetch the segments for SponsorBlock

app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt

@@ -323,10 +323,14 @@ internal class CustomExoPlayerView(
 
         // hide the dimming background overlay if locked
         binding.exoControlsBackground.setBackgroundColor(
-            if (isLocked) ContextCompat.getColor(
+            if (isLocked) {
+                ContextCompat.getColor(
                     context,
                     com.google.android.exoplayer2.R.color.exo_black_opacity_60
-            ) else Color.TRANSPARENT
+                )
+            } else {
+                Color.TRANSPARENT
+            }
         )
 
         // disable tap and swipe gesture if the player is locked

app/src/main/java/com/github/libretube/util/PlayerHelper.kt

@@ -5,64 +5,57 @@ import android.content.pm.ActivityInfo
 import android.view.accessibility.CaptioningManager
 import com.github.libretube.api.obj.PipedStream
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.enums.AudioQuality
 import com.google.android.exoplayer2.ui.CaptionStyleCompat
 import com.google.android.exoplayer2.video.VideoSize
 import kotlin.math.roundToInt
 
 object PlayerHelper {
-    // get the audio source following the users preferences
+    /**
+     * Get the audio source following the users preferences
+     */
     fun getAudioSource(
         context: Context,
         audios: List<PipedStream>
     ): String {
         val audioFormat = PreferenceHelper.getString(PreferenceKeys.PLAYER_AUDIO_FORMAT, "all")
-        val audioQuality = if (
+        val audioPrefKey = if (
             NetworkHelper.isNetworkMobile(context)
         ) {
-            PreferenceHelper.getString(PreferenceKeys.PLAYER_AUDIO_QUALITY_MOBILE, "best")
+            PreferenceKeys.PLAYER_AUDIO_QUALITY_MOBILE
         } else {
-            PreferenceHelper.getString(PreferenceKeys.PLAYER_AUDIO_QUALITY, "best")
+            PreferenceKeys.PLAYER_AUDIO_QUALITY
         }
 
-        val mutableAudios = audios.toMutableList()
+        val audioQuality = PreferenceHelper.getString(audioPrefKey, "best")
-        if (audioFormat != "all") {
+
-            audios.forEach {
+        val filteredAudios = audios.filter {
             val audioMimeType = "audio/$audioFormat"
-                if (it.mimeType != audioMimeType) mutableAudios.remove(it)
+            it.mimeType != audioMimeType || audioFormat == "all"
-            }
         }
 
-        return if (audioQuality == "worst") {
+        return getBitRate(
-            getLeastBitRate(mutableAudios)
+            filteredAudios,
-        } else {
+            if (audioQuality == "best") AudioQuality.BEST else AudioQuality.WORST
-            getMostBitRate(mutableAudios)
+        )
-        }
     }
 
-    // get the best bit rate from audio streams
+    /**
-    private fun getMostBitRate(audios: List<PipedStream>): String {
+     * Get the best or worst bitrate from a list of audio streams
-        var bitrate = 0
+     * @param audios list of the audio streams
-        var audioUrl = ""
+     * @param getLeast whether the least bitrate should be returned
-        audios.forEach {
+     * @return Url of the audio source
-            if (it.bitrate != null && it.bitrate!! > bitrate) {
+     */
-                bitrate = it.bitrate!!
+    private fun getBitRate(audios: List<PipedStream>, quality: AudioQuality): String {
-                audioUrl = it.url.toString()
+        val filteredAudios = audios.filter {
+            it.bitrate != null
+        }.sortedBy {
+            it.bitrate
         }
-        }
+        return when (quality) {
-        return audioUrl
+            AudioQuality.BEST -> filteredAudios.last()
-    }
+            AudioQuality.WORST -> filteredAudios.first()
-
+        }.url!!
-    // get the best bit rate from audio streams
-    private fun getLeastBitRate(audios: List<PipedStream>): String {
-        var bitrate = 1000000000
-        var audioUrl = ""
-        audios.forEach {
-            if (it.bitrate != null && it.bitrate!! < bitrate) {
-                bitrate = it.bitrate!!
-                audioUrl = it.url.toString()
-            }
-        }
-        return audioUrl
     }
 
     // get the system default caption style