Merge pull request TeamNewPipe#13135 from dustdfg/player_loop_refactor

Misc player loop/stream refactors

Author: absurdlylongusername

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -49,12 +49,12 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 public final class PlayerHelper {
     private static final FormattersProvider FORMATTERS_PROVIDER = new FormattersProvider();
@@ -87,11 +87,11 @@ public static void resetFormat() {
     }
 
     @NonNull
-    public static String getTimeString(final int milliSeconds) {
-        final int seconds = (milliSeconds % 60000) / 1000;
-        final int minutes = (milliSeconds % 3600000) / 60000;
-        final int hours = (milliSeconds % 86400000) / 3600000;
-        final int days = (milliSeconds % (86400000 * 7)) / 86400000;
+    public static String getTimeString(final long milliSeconds) {
+        final long seconds = (milliSeconds % 60000) / 1000;
+        final long minutes = (milliSeconds % 3600000) / 60000;
+        final long hours = (milliSeconds % 86400000) / 3600000;
+        final long days = (milliSeconds % (86400000 * 7)) / 86400000;
 
         final Formatters formatters = FORMATTERS_PROVIDER.formatters();
         if (days > 0) {
@@ -174,10 +174,9 @@ public static String resizeTypeOf(@NonNull final Context context,
     @Nullable
     public static PlayQueue autoQueueOf(@NonNull final StreamInfo info,
                                         @NonNull final List<PlayQueueItem> existingItems) {
-        final Set<String> urls = new HashSet<>(existingItems.size());
-        for (final PlayQueueItem item : existingItems) {
-            urls.add(item.getUrl());
-        }
+        final Set<String> urls = existingItems.stream()
+                .map(PlayQueueItem::getUrl)
+                .collect(Collectors.toUnmodifiableSet());
 
         final List<InfoItem> relatedItems = info.getRelatedItems();
         if (Utils.isNullOrEmpty(relatedItems)) {

app/src/main/java/org/schabi/newpipe/player/playqueue/SinglePlayQueue.java

@@ -5,8 +5,8 @@
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public final class SinglePlayQueue extends PlayQueue {
     public SinglePlayQueue(final StreamInfoItem item) {
@@ -29,11 +29,7 @@ public SinglePlayQueue(@NonNull final List<StreamInfoItem> items, final int inde
     }
 
     private static List<PlayQueueItem> playQueueItemsOf(@NonNull final List<StreamInfoItem> items) {
-        final List<PlayQueueItem> playQueueItems = new ArrayList<>(items.size());
-        for (final StreamInfoItem item : items) {
-            playQueueItems.add(new PlayQueueItem(item));
-        }
-        return playQueueItems;
+        return items.stream().map(PlayQueueItem::new).collect(Collectors.toList());
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java

@@ -77,6 +77,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutChangeListener {
     private static final String TAG = MainPlayerUi.class.getSimpleName();
@@ -749,13 +750,13 @@ public void onItemLongClick(@NonNull final StreamSegmentItem item, final int sec
     }
 
     private int getNearestStreamSegmentPosition(final long playbackPosition) {
-        int nearestPosition = 0;
         final List<StreamSegment> segments = player.getCurrentStreamInfo()
                 .map(StreamInfo::getStreamSegments)
                 .orElse(Collections.emptyList());
 
-        for (int i = 0; i < segments.size(); i++) {
-            if (segments.get(i).getStartTimeSeconds() * 1000L > playbackPosition) {
+        int nearestPosition = 0;
+        for (final var segment : segments) {
+            if (segment.getStartTimeSeconds() * 1000L > playbackPosition) {
                 break;
             }
             nearestPosition++;
@@ -816,22 +817,13 @@ private void updateQueueTime(final int currentTime) {
         }
 
         final int currentStream = playQueue.getIndex();
-        int before = 0;
-        int after = 0;
-
         final List<PlayQueueItem> streams = playQueue.getStreams();
-        final int nStreams = streams.size();
 
-        for (int i = 0; i < nStreams; i++) {
-            if (i < currentStream) {
-                before += streams.get(i).getDuration();
-            } else {
-                after += streams.get(i).getDuration();
-            }
-        }
+        final long before = streams.subList(0, currentStream).stream()
+                .collect(Collectors.summingLong(PlayQueueItem::getDuration)) * 1000;
 
-        before *= 1000;
-        after *= 1000;
+        final long after = streams.subList(currentStream, streams.size()).stream()
+                .collect(Collectors.summingLong(PlayQueueItem::getDuration)) * 1000;
 
         binding.itemsListHeaderDuration.setText(
                 String.format("%s/%s",