From 1f505fa9fd6f107e22e945d243630acdc92d202d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 3 Jan 2020 10:22:27 +0000
Subject: [PATCH] Show ad markers after the window duration

Issue: #6552
PiperOrigin-RevId: 287964221
---
 RELEASENOTES.md                                                | 3 +++
 .../com/google/android/exoplayer2/ui/PlayerControlView.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1aeabd1a8f..b6568ac51d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -17,6 +17,9 @@
 * Support "twos" codec (big endian PCM) in MP4
   ([#5789](https://github.com/google/ExoPlayer/issues/5789)).
 * WAV: Support IMA ADPCM encoded data.
+* Show ad group markers in `DefaultTimeBar` even if they are after the end of
+  the current window
+  ([#6552](https://github.com/google/ExoPlayer/issues/6552)).
 
 ### 2.11.1 (2019-12-20) ###
 
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
index 248ac9fdaf..bfb4e018f0 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -943,7 +943,7 @@ public class PlayerControlView extends FrameLayout {
               adGroupTimeInPeriodUs = period.durationUs;
             }
             long adGroupTimeInWindowUs = adGroupTimeInPeriodUs + period.getPositionInWindowUs();
-            if (adGroupTimeInWindowUs >= 0 && adGroupTimeInWindowUs <= window.durationUs) {
+            if (adGroupTimeInWindowUs >= 0) {
               if (adGroupCount == adGroupTimesMs.length) {
                 int newLength = adGroupTimesMs.length == 0 ? 1 : adGroupTimesMs.length * 2;
                 adGroupTimesMs = Arrays.copyOf(adGroupTimesMs, newLength);