[YouTube] Return the POST_LIVE_STREAM stream type

Return the POST_LIVE_STREAM stream type when a stream has the boolean isPostLiveDvr present and when this boolean is set to true

Author: AudricV

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -689,11 +689,13 @@ public List<SubtitlesStream> getSubtitles(final MediaFormat format) throws Parsi
     public StreamType getStreamType() {
         assertPageFetched();
 
-        if (playerResponse.getObject("playabilityStatus").has("liveStreamability")
-                || playerResponse.getObject("videoDetails").getBoolean("isPostLiveDvr", false)) {
+        if (playerResponse.getObject("playabilityStatus").has("liveStreamability")) {
             return StreamType.LIVE_STREAM;
+        } else if (playerResponse.getObject("videoDetails").getBoolean("isPostLiveDvr", false)) {
+            return StreamType.POST_LIVE_STREAM;
+        } else {
+            return StreamType.VIDEO_STREAM;
         }
-        return StreamType.VIDEO_STREAM;
     }
 
     @Nullable
@@ -1167,12 +1169,22 @@ private List<ContentAndItagItemAndIsUrl> getItags(final String streamingDataKey,
             throws ParsingException {
         final List<ContentAndItagItemAndIsUrl> contentsAndItagItems = new ArrayList<>();
         if (mobileStreamingData != null || desktopStreamingData != null) {
-            // Use the mobileStreamingData object first because there is no n param and no
-            // signatureCiphers in streaming URLs of the Android client
-            contentsAndItagItems.addAll(getStreamsFromStreamingDataKey(mobileStreamingData,
-                    streamingDataKey, itagTypeWanted));
-            contentsAndItagItems.addAll(getStreamsFromStreamingDataKey(desktopStreamingData,
-                    streamingDataKey, itagTypeWanted));
+            final StreamType streamType = getStreamType();
+            if (streamType == StreamType.VIDEO_STREAM) {
+                // Use the mobileStreamingData JSON object first because there is no n param and no
+                // signatureCiphers in streaming URLs of the Android client
+                contentsAndItagItems.addAll(getStreamsFromStreamingDataKey(mobileStreamingData,
+                        streamingDataKey, itagTypeWanted, streamType));
+                contentsAndItagItems.addAll(getStreamsFromStreamingDataKey(desktopStreamingData,
+                        streamingDataKey, itagTypeWanted, streamType));
+            } else {
+                // Use the desktopStreamingData JSON object first because there are less redirects
+                // from the desktop endpoint
+                contentsAndItagItems.addAll(getStreamsFromStreamingDataKey(desktopStreamingData,
+                        streamingDataKey, itagTypeWanted, streamType));
+                contentsAndItagItems.addAll(getStreamsFromStreamingDataKey(mobileStreamingData,
+                        streamingDataKey, itagTypeWanted, streamType));
+            }
         }
 
         return contentsAndItagItems;
@@ -1182,13 +1194,13 @@ private List<ContentAndItagItemAndIsUrl> getItags(final String streamingDataKey,
     private List<ContentAndItagItemAndIsUrl> getStreamsFromStreamingDataKey(
             final JsonObject streamingData,
             final String streamingDataKey,
-            final ItagItem.ItagType itagTypeWanted) throws ParsingException {
+            final ItagItem.ItagType itagTypeWanted,
+            final StreamType streamType) throws ParsingException {
 
         final List<ContentAndItagItemAndIsUrl> contentsAndItagItemsAndAreUrls = new ArrayList<>();
         if (streamingData != null && streamingData.has(streamingDataKey)) {
             final YoutubeThrottlingDecrypter throttlingDecrypter = new YoutubeThrottlingDecrypter(
                     getId());
-            final StreamType streamType = getStreamType();
             final JsonArray formats = streamingData.getArray(streamingDataKey);
             for (int i = 0; i != formats.size(); ++i) {
                 final JsonObject formatData = formats.getObject(i);