From b13b272695b02f1b72d425c8fbdb9accc1f23ad3 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Mon, 20 Mar 2023 13:52:05 +0000
Subject: [PATCH] Use correct period duration in fake live timeline

PiperOrigin-RevId: 517953981
---
 .../media3/exoplayer/MediaPeriodQueueTest.java       | 12 ++++++------
 .../test/utils/FakeMultiPeriodLiveTimeline.java      |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaPeriodQueueTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaPeriodQueueTest.java
index 2cd1b226de..218460b894 100644
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaPeriodQueueTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaPeriodQueueTest.java
@@ -593,10 +593,10 @@ public final class MediaPeriodQueueTest {
     advance();
     assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
         new Pair<Object, Object>(((Pair<Object, Object>) firstPeriodUid).first, "uid-4[a]"),
-        /* startPositionUs= */ 0,
+        /* startPositionUs= */ adPeriodDurationUs,
         /* requestedContentPositionUs= */ 0,
-        /* endPositionUs= */ 0,
-        /* durationUs= */ 0,
+        /* endPositionUs= */ adPeriodDurationUs,
+        /* durationUs= */ adPeriodDurationUs,
         /* isFollowedByTransitionToSameStream= */ false,
         /* isLastInPeriod= */ true,
         /* isLastInWindow= */ false,
@@ -613,10 +613,10 @@ public final class MediaPeriodQueueTest {
     advance();
     assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
         new Pair<Object, Object>(((Pair<Object, Object>) firstPeriodUid).first, "uid-5[a]"),
-        /* startPositionUs= */ 0,
+        /* startPositionUs= */ adPeriodDurationUs,
         /* requestedContentPositionUs= */ 0,
-        /* endPositionUs= */ 0,
-        /* durationUs= */ 0,
+        /* endPositionUs= */ adPeriodDurationUs,
+        /* durationUs= */ adPeriodDurationUs,
         /* isFollowedByTransitionToSameStream= */ false,
         /* isLastInPeriod= */ true,
         /* isLastInWindow= */ false,
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMultiPeriodLiveTimeline.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMultiPeriodLiveTimeline.java
index 26daf54472..a00b8679a7 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMultiPeriodLiveTimeline.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMultiPeriodLiveTimeline.java
@@ -213,7 +213,6 @@ public class FakeMultiPeriodLiveTimeline extends Timeline {
     while (lastPeriodStartTimeUs < now) {
       isAd = adSequencePattern[lastPeriodIndex % sequencePeriodCount];
       long periodDurationUs = isAd ? AD_PERIOD_DURATION_US : PERIOD_DURATION_US;
-      long adPeriodDurationUs = periodDurationUs;
       AdPlaybackState adPlaybackState = AdPlaybackState.NONE;
       if (!isContentTimeline) {
         adPlaybackState = new AdPlaybackState("adsId").withLivePostrollPlaceholderAppended();
@@ -224,14 +223,15 @@ public class FakeMultiPeriodLiveTimeline extends Timeline {
                   .withIsServerSideInserted(/* adGroupIndex= */ 0, /* isServerSideInserted= */ true)
                   .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
                   .withAdDurationsUs(
-                      /* adGroupIndex= */ 0, /* adDurationsUs...= */ periodDurationUs);
-          adPeriodDurationUs = 0;
+                      /* adGroupIndex= */ 0, /* adDurationsUs...= */ periodDurationUs)
+                  .withContentResumeOffsetUs(
+                      /* adGroupIndex= */ 0, /* contentResumeOffsetUs= */ periodDurationUs);
         }
       }
       liveWindow.add(
           new PeriodData(
               /* id= */ lastPeriodIndex++,
-              adPeriodDurationUs,
+              periodDurationUs,
               /* positionInWindowUs= */ lastPeriodStartTimeUs - windowStartTimeUs,
               isAd,
               adPlaybackState));