Merge branch 'dev' of github.com:TeamNewPipe/NewPipe into alang-selector

Author: Theta-Dev

.github/workflows/ci.yml

@@ -44,10 +44,10 @@ jobs:
         if: github.event_name == 'pull_request'
         run: git checkout -B ${{ github.head_ref }}
 
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 
@@ -66,28 +66,33 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        # api-level 19 is min sdk, but throws errors related to desugaring
-        api-level: [ 21, 29 ]
+        include:
+          - api-level: 21
+            target: default
+            arch: x86
+          - api-level: 33
+            target: google_apis # emulator API 33 only exists with Google APIs
+            arch: x86_64
 
     permissions:
       contents: read
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 
       - name: Run android tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
-          # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160
-          emulator-build: 7425822
+          target: ${{ matrix.target }}
+          arch: ${{ matrix.arch }}
           script: ./gradlew connectedCheck --stacktrace
 
       - name: Upload test report when tests fail # because the printed out stacktrace (console) is too short, see also #7553
@@ -108,10 +113,10 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11 # Sonar requires JDK 11
+          java-version: 17
           distribution: "temurin"
           cache: 'gradle'
 

app/build.gradle

@@ -80,13 +80,13 @@ android {
         // Flag to enable support for the new language APIs
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
         encoding 'utf-8'
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     sourceSets {
@@ -98,10 +98,11 @@ android {
     }
 
     packagingOptions {
-        // remove two files which belong to jsoup
-        // no idea how they ended up in the META-INF dir...
-        exclude 'META-INF/README.md'
-        exclude 'META-INF/CHANGES'
+        resources {
+            // remove two files which belong to jsoup
+            // no idea how they ended up in the META-INF dir...
+            excludes += ['META-INF/README.md', 'META-INF/CHANGES']
+        }
     }
 }
 

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

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.player.resolver;
 
 import static org.schabi.newpipe.util.ListHelper.getFilteredAudioStreams;
-import static org.schabi.newpipe.util.ListHelper.getNonTorrentStreams;
+import static org.schabi.newpipe.util.ListHelper.getPlayableStreams;
 
 import android.content.Context;
 import android.util.Log;
@@ -64,7 +64,8 @@ public MediaSource resolve(@NonNull final StreamInfo info) {
             stream = getStreamForIndex(audioIndex, audioStreams);
             tag = StreamInfoTag.of(info, audioStreams, audioIndex);
         } else {
-            final List<VideoStream> videoStreams = getNonTorrentStreams(info.getVideoStreams());
+            final List<VideoStream> videoStreams =
+                    getPlayableStreams(info.getVideoStreams(), info.getServiceId());
             if (!videoStreams.isEmpty()) {
                 final int index = ListHelper.getDefaultResolutionIndex(context, videoStreams);
                 stream = getStreamForIndex(index, videoStreams);

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

@@ -30,7 +30,7 @@
 import static com.google.android.exoplayer2.C.TIME_UNSET;
 import static org.schabi.newpipe.util.ListHelper.getFilteredAudioStreams;
 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();
@@ -75,8 +75,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(), info.getServiceId()),
+                getPlayableStreams(info.getVideoOnlyStreams(), info.getServiceId()), false, true);
         final List<AudioStream> audioStreamsList =
                 getFilteredAudioStreams(context, info.getAudioStreams());
 

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

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.util;
 
+import static org.schabi.newpipe.extractor.ServiceList.YouTube;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
@@ -50,8 +52,22 @@ public final class ListHelper {
     private static final List<AudioTrackType> AUDIO_TRACK_TYPE_RANKING_DESCRIPTIVE =
             List.of(AudioTrackType.ORIGINAL, AudioTrackType.DUBBED, AudioTrackType.DESCRIPTIVE);
 
-    private ListHelper() {
-    }
+    /**
+     * 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() { }
 
     /**
      * @param context      Android app context
@@ -150,7 +166,7 @@ public static int getAudioFormatIndex(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);
@@ -165,23 +181,31 @@ 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
+     * @param streamList the original stream list
+     * @param serviceId
+     * @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, final int serviceId) {
+        final int youtubeServiceId = YouTube.getServiceId();
         return getFilteredStreamList(streamList,
-                stream -> stream.getDeliveryMethod() != DeliveryMethod.TORRENT);
+                stream -> stream.getDeliveryMethod() != DeliveryMethod.TORRENT
+                        && (serviceId != youtubeServiceId
+                        || stream.getItagItem() == null
+                        || SUPPORTED_ITAG_IDS.contains(stream.getItagItem().id)));
     }
 
     /**
@@ -312,7 +336,7 @@ public static List<List<AudioStream>> getGroupedAudioStreams(
      * @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();
@@ -323,7 +347,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);

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -1,4 +1,7 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=false
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx2048M --add-opens jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
 systemProp.file.encoding=utf-8

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4
+distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists