Use overflow-save add operation for blacklisting duration.

This allows to specify open-ended blacklisting with Long.MAX_VALUE. PiperOrigin-RevId: 222550939
google · Nov 23, 2018 · f8a3c13 · f8a3c13
1 parent 56e4860
commit f8a3c13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -70,7 +70,6 @@
             .setMimeType(MIME_TYPE_VIDEO_MP4)
             .setMedia("https://html5demos.com/assets/dizzy.mp4")
             .buildAndClear());
-
     SAMPLES = Collections.unmodifiableList(samples);
 
   }

diff --git a/...y/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java b/...y/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java
@@ -22,6 +22,7 @@
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.chunk.MediaChunk;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -160,7 +161,10 @@ public final boolean blacklist(int index, long blacklistDurationMs) {
     if (!canBlacklist) {
       return false;
     }
-    blacklistUntilTimes[index] = Math.max(blacklistUntilTimes[index], nowMs + blacklistDurationMs);
+    blacklistUntilTimes[index] =
+        Math.max(
+            blacklistUntilTimes[index],
+            Util.addWithOverflowDefault(nowMs, blacklistDurationMs, Long.MAX_VALUE));
     return true;
   }