Use a whitelist to filter all streams retrieved by the extractor.

NewPipe Extractor now extracts all YouTube Itags and therefore only those which can be handled by the player need to be retrieved from the list of all available streams.

Author: TobiGr

app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.player.resolver;
 
-import static org.schabi.newpipe.util.ListHelper.getNonTorrentStreams;
+import static org.schabi.newpipe.util.ListHelper.getPlayableStreams;
 
 import android.content.Context;
 import android.util.Log;
@@ -68,12 +68,12 @@ public MediaSource resolve(@NonNull final StreamInfo info) {
      */
     @Nullable
     private Stream getAudioSource(@NonNull final StreamInfo info) {
-        final List<AudioStream> audioStreams = getNonTorrentStreams(info.getAudioStreams());
+        final List<AudioStream> audioStreams = getPlayableStreams(info.getAudioStreams());
         if (!audioStreams.isEmpty()) {
             final int index = ListHelper.getDefaultAudioFormat(context, audioStreams);
             return getStreamForIndex(index, audioStreams);
         } else {
-            final List<VideoStream> videoStreams = getNonTorrentStreams(info.getVideoStreams());
+            final List<VideoStream> videoStreams = getPlayableStreams(info.getVideoStreams());
             if (!videoStreams.isEmpty()) {
                 final int index = ListHelper.getDefaultResolutionIndex(context, videoStreams);
                 return getStreamForIndex(index, videoStreams);

app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java

@@ -29,7 +29,7 @@
 
 import static com.google.android.exoplayer2.C.TIME_UNSET;
 import static org.schabi.newpipe.util.ListHelper.getUrlAndNonTorrentStreams;
-import static org.schabi.newpipe.util.ListHelper.getNonTorrentStreams;
+import static org.schabi.newpipe.util.ListHelper.getPlayableStreams;
 
 public class VideoPlaybackResolver implements PlaybackResolver {
     private static final String TAG = VideoPlaybackResolver.class.getSimpleName();
@@ -72,8 +72,8 @@ public MediaSource resolve(@NonNull final StreamInfo info) {
 
         // Create video stream source
         final List<VideoStream> videoStreamsList = ListHelper.getSortedStreamVideosList(context,
-                getNonTorrentStreams(info.getVideoStreams()),
-                getNonTorrentStreams(info.getVideoOnlyStreams()), false, true);
+                getPlayableStreams(info.getVideoStreams()),
+                getPlayableStreams(info.getVideoOnlyStreams()), false, true);
         final int index;
         if (videoStreamsList.isEmpty()) {
             index = -1;
@@ -100,7 +100,7 @@ public MediaSource resolve(@NonNull final StreamInfo info) {
         }
 
         // Create optional audio stream source
-        final List<AudioStream> audioStreams = getNonTorrentStreams(info.getAudioStreams());
+        final List<AudioStream> audioStreams = getPlayableStreams(info.getAudioStreams());
         final AudioStream audio = audioStreams.isEmpty() ? null : audioStreams.get(
                 ListHelper.getDefaultAudioFormat(context, audioStreams));
 

app/src/main/java/org/schabi/newpipe/util/ListHelper.java

@@ -42,6 +42,21 @@ public final class ListHelper {
     // Use a Set for better performance
     private static final Set<String> HIGH_RESOLUTION_LIST = Set.of("1440p", "2160p");
 
+    /**
+     * List of supported YouTube Itag ids.
+     * The original order is kept.
+     * @see {@link org.schabi.newpipe.extractor.services.youtube.ItagItem#ITAG_LIST}
+     */
+    private static final List<Integer> SUPPORTED_ITAG_IDS =
+            List.of(
+                    17, 36, // video v3GPP
+                    18, 34, 35, 59, 78, 22, 37, 38, // video MPEG4
+                    43, 44, 45, 46, // video webm
+                    171, 172, 139, 140, 141, 249, 250, 251, // audio
+                    160, 133, 134, 135, 212, 136, 298, 137, 299, 266, // video only
+                    278, 242, 243, 244, 245, 246, 247, 248, 271, 272, 302, 303, 308, 313, 315
+            );
+
     private ListHelper() { }
 
     /**
@@ -121,7 +136,7 @@ public static int getDefaultAudioFormat(final Context context,
      */
     @NonNull
     public static <S extends Stream> List<S> getStreamsOfSpecifiedDelivery(
-            final List<S> streamList,
+            @Nullable final List<S> streamList,
             final DeliveryMethod deliveryMethod) {
         return getFilteredStreamList(streamList,
                 stream -> stream.getDeliveryMethod() == deliveryMethod);
@@ -136,23 +151,28 @@ public static <S extends Stream> List<S> getStreamsOfSpecifiedDelivery(
      */
     @NonNull
     public static <S extends Stream> List<S> getUrlAndNonTorrentStreams(
-            final List<S> streamList) {
+            @Nullable final List<S> streamList) {
         return getFilteredStreamList(streamList,
                 stream -> stream.isUrl() && stream.getDeliveryMethod() != DeliveryMethod.TORRENT);
     }
 
     /**
-     * Return a {@link Stream} list which only contains non-torrent streams.
+     * Return a {@link Stream} list which only contains streams which can be played by the player.
+     * <br>
+     * Some formats are not supported. For more info, see {@link #SUPPORTED_ITAG_IDS}.
+     * Torrent streams are also removed, because they cannot be retrieved.
      *
      * @param streamList the original stream list
      * @param <S>        the item type's class that extends {@link Stream}
-     * @return a stream list which only contains non-torrent streams
+     * @return a stream list which only contains streams that can be played the player
      */
     @NonNull
-    public static <S extends Stream> List<S> getNonTorrentStreams(
-            final List<S> streamList) {
+    public static <S extends Stream> List<S> getPlayableStreams(
+            @Nullable final List<S> streamList) {
         return getFilteredStreamList(streamList,
-                stream -> stream.getDeliveryMethod() != DeliveryMethod.TORRENT);
+                stream -> stream.getDeliveryMethod() != DeliveryMethod.TORRENT
+                        && (stream.getItagItem() == null
+                        || SUPPORTED_ITAG_IDS.contains(stream.getItagItem().id)));
     }
 
     /**
@@ -199,7 +219,7 @@ public static List<VideoStream> getSortedStreamVideosList(
      * @return a new stream list filtered using the given predicate
      */
     private static <S extends Stream> List<S> getFilteredStreamList(
-            final List<S> streamList,
+            @Nullable final List<S> streamList,
             final Predicate<S> streamListPredicate) {
         if (streamList == null) {
             return Collections.emptyList();
@@ -210,7 +230,7 @@ private static <S extends Stream> List<S> getFilteredStreamList(
                 .collect(Collectors.toList());
     }
 
-    private static String computeDefaultResolution(final Context context, final int key,
+    private static String computeDefaultResolution(@NonNull final Context context, final int key,
                                                    final int value) {
         final SharedPreferences preferences =
                 PreferenceManager.getDefaultSharedPreferences(context);