add more filters to trackutils

TeamNewPipe · Oct 17, 2024 · 5f5ebe7 · 5f5ebe7
1 parent ae9fbda
commit 5f5ebe7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 3 deletions.
diff --git a/new-player/src/main/java/net/newpipe/newplayer/logic/ConstraintStreamSelector.kt b/new-player/src/main/java/net/newpipe/newplayer/logic/ConstraintStreamSelector.kt
@@ -8,9 +8,18 @@ internal object ConstraintStreamSelector {
     fun selectStream(
         availableStreams: List<Stream>,
         currentStreamSelection: StreamSelection,
-        currentlyPlayingTracks: List<StreamTrack>
+        currentlyPlayingTracks: List<StreamTrack>,
+        languageConstraint: String?,
+        trackConstraint: StreamTrack?
     ): StreamSelection {
 
+        val availableFilteredByLanguage = if (languageConstraint != null)
+            TrackUtils.filtersByLanguage(availableStreams, languageConstraint)
+        else
+            availableStreams
+
+
+
         return currentStreamSelection
     }
 }
diff --git a/new-player/src/main/java/net/newpipe/newplayer/logic/TrackUtils.kt b/new-player/src/main/java/net/newpipe/newplayer/logic/TrackUtils.kt
@@ -20,6 +20,7 @@
 
 package net.newpipe.newplayer.logic
 
+import android.provider.MediaStore.Video
 import android.util.Log
 import androidx.annotation.OptIn
 import androidx.media3.common.C
@@ -135,12 +136,40 @@ object TrackUtils {
         return false
     }
 
+    internal fun getStreamMatchingAudioTrack(
+        availableStreams: List<Stream>,
+        track: AudioStreamTrack,
+        matchLanguage: Boolean = true,
+        matchBitrate: Boolean = true,
+        matchFileFormat: Boolean = true,
+    ) = availableStreams.filterIsInstance<AudioStreamTrack>()
+        .filter{!matchLanguage || it.language == track.language}
+        .filter{!matchBitrate || it.bitrate == track.bitrate}
+        .filter{!matchFileFormat || it.fileFormat == track.fileFormat}
+
+
+    internal fun getStreamsMatchingVideoTrack(
+        availableStreams: List<Stream>,
+        track: VideoStreamTrack,
+        matchWidth: Boolean = true,
+        matchHeight: Boolean = true,
+        matchFrameRate: Boolean = true,
+        matchFileFormat: Boolean = true
+    ) = availableStreams.filterIsInstance<VideoStreamTrack>()
+        .filter{!matchWidth || it.width == track.width}
+        .filter{!matchHeight || it.height == track.height}
+        .filter{!matchFrameRate || it.frameRate == track.frameRate}
+        .filter{!matchFileFormat || it.fileFormat == track.fileFormat}
+
     @OptIn(UnstableApi::class)
-    internal fun streamTracksFromMedia3Tracks(media3Tracks: Tracks, onlySelectedTracks: Boolean = false): List<StreamTrack> {
+    internal fun streamTracksFromMedia3Tracks(
+        media3Tracks: Tracks,
+        onlySelectedTracks: Boolean = false
+    ): List<StreamTrack> {
         val tracks = mutableListOf<StreamTrack>()
         for (group in media3Tracks.groups) {
             for (i in 0 until group.length) {
-                if(onlySelectedTracks && group.isTrackSelected(i))
+                if (onlySelectedTracks && group.isTrackSelected(i))
                     continue
 
                 val format = group.getTrackFormat(i)