Parallelize YouTubeStreamExtractor with a ExecutorService.

Author: FireMasterK

extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java

@@ -26,6 +26,8 @@
 import org.schabi.newpipe.extractor.localization.Localization;
 
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -38,6 +40,8 @@ public final class NewPipe {
     private static Localization preferredLocalization;
     private static ContentCountry preferredContentCountry;
 
+    private static ExecutorService executorService;
+
     private NewPipe() {
     }
 
@@ -51,9 +55,15 @@ public static void init(final Downloader d, final Localization l) {
     }
 
     public static void init(final Downloader d, final Localization l, final ContentCountry c) {
+        init(d, l, c, Executors.newCachedThreadPool());
+    }
+
+    public static void init(final Downloader d, final Localization l, final ContentCountry c,
+                            final ExecutorService e) {
         downloader = d;
         preferredLocalization = l;
         preferredContentCountry = c;
+        executorService = e;
     }
 
     public static Downloader getDownloader() {
@@ -132,4 +142,13 @@ public static ContentCountry getPreferredContentCountry() {
     public static void setPreferredContentCountry(final ContentCountry preferredContentCountry) {
         NewPipe.preferredContentCountry = preferredContentCountry;
     }
+
+    @Nonnull
+    public static ExecutorService getExecutorService() {
+        return executorService;
+    }
+
+    public static void setExecutorService(final ExecutorService executorService) {
+        NewPipe.executorService = executorService;
+    }
 }

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

@@ -49,6 +49,7 @@
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.MetaInfo;
 import org.schabi.newpipe.extractor.MultiInfoItemsCollector;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException;
@@ -97,6 +98,8 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
@@ -773,6 +776,35 @@ public void onFetchPage(@Nonnull final Downloader downloader)
         final ContentCountry contentCountry = getExtractorContentCountry();
         html5Cpn = generateContentPlaybackNonce();
 
+        final Future<Void> nextFuture = NewPipe.getExecutorService().submit(() -> {
+            try {
+                final byte[] body = JsonWriter.string(
+                                prepareDesktopJsonBuilder(localization, contentCountry)
+                                        .value(VIDEO_ID, videoId)
+                                        .value(CONTENT_CHECK_OK, true)
+                                        .value(RACY_CHECK_OK, true)
+                                        .done())
+                        .getBytes(StandardCharsets.UTF_8);
+                nextResponse = getJsonPostResponse(NEXT, body, localization);
+            } catch (final Exception e) {
+                throw new RuntimeException(e);
+            }
+            return null;
+        });
+
+        Future<Void> androidPlayerFuture = null;
+
+        if (isAndroidClientFetchForced) {
+            androidPlayerFuture = getAndroidFetchFuture(contentCountry, localization, videoId);
+        }
+
+        Future<Void> iosPlayerFuture = null;
+
+        if (isIosClientFetchForced) {
+            iosPlayerFuture = getIosFetchFuture(contentCountry, localization, videoId);
+        }
+
+
         playerResponse = getJsonPostResponse(PLAYER,
                 createDesktopPlayerBody(localization, contentCountry, videoId, sts, false,
                         html5Cpn),
@@ -820,37 +852,64 @@ public void onFetchPage(@Nonnull final Downloader downloader)
         playerMicroFormatRenderer = youtubePlayerResponse.getObject("microformat")
                 .getObject("playerMicroformatRenderer");
 
-        final byte[] body = JsonWriter.string(
-                prepareDesktopJsonBuilder(localization, contentCountry)
-                        .value(VIDEO_ID, videoId)
-                        .value(CONTENT_CHECK_OK, true)
-                        .value(RACY_CHECK_OK, true)
-                        .done())
-                .getBytes(StandardCharsets.UTF_8);
-        nextResponse = getJsonPostResponse(NEXT, body, localization);
-
         // streamType can only have LIVE_STREAM, POST_LIVE_STREAM and VIDEO_STREAM values (see
         // setStreamType()), so this block will be run only for POST_LIVE_STREAM and VIDEO_STREAM
         // values if fetching of the ANDROID client is not forced
         if ((!isAgeRestricted && streamType != StreamType.LIVE_STREAM)
-                || isAndroidClientFetchForced) {
+                && androidPlayerFuture == null) {
+            androidPlayerFuture = getAndroidFetchFuture(contentCountry, localization, videoId);
+        }
+
+        if ((!isAgeRestricted && streamType == StreamType.LIVE_STREAM)
+                && iosPlayerFuture == null) {
+            iosPlayerFuture = getIosFetchFuture(contentCountry, localization, videoId);
+        }
+
+        try {
+            nextFuture.get();
+
+            if (androidPlayerFuture != null) {
+                androidPlayerFuture.get();
+            }
+            if (iosPlayerFuture != null) {
+                iosPlayerFuture.get();
+            }
+
+        } catch (final InterruptedException ignored) {
+        } catch (final ExecutionException e) {
+            final Throwable cause = e.getCause();
+            if (cause != null) {
+                throw new RuntimeException(cause);
+            }
+        }
+    }
+
+    private Future<Void> getAndroidFetchFuture(final ContentCountry contentCountry,
+                                               final Localization localization,
+                                               final String videoId) {
+        return NewPipe.getExecutorService().submit(() -> {
             try {
                 fetchAndroidMobileJsonPlayer(contentCountry, localization, videoId);
             } catch (final Exception ignored) {
                 // Ignore exceptions related to ANDROID client fetch or parsing, as it is not
                 // compulsory to play contents
             }
-        }
+            return null;
+        });
+    }
 
-        if ((!isAgeRestricted && streamType == StreamType.LIVE_STREAM)
-                || isIosClientFetchForced) {
+    private Future<Void> getIosFetchFuture(final ContentCountry contentCountry,
+                                               final Localization localization,
+                                               final String videoId) {
+        return NewPipe.getExecutorService().submit(() -> {
             try {
                 fetchIosMobileJsonPlayer(contentCountry, localization, videoId);
             } catch (final Exception ignored) {
                 // Ignore exceptions related to IOS client fetch or parsing, as it is not
                 // compulsory to play contents
             }
-        }
+            return null;
+        });
     }
 
     private void checkPlayabilityStatus(final JsonObject youtubePlayerResponse,