Commit 4a6ba35f by bachinger Committed by microkatz

Use correct period duration in fake live timeline

PiperOrigin-RevId: 517953981
parent 7f4fdb63
......@@ -587,10 +587,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,
......@@ -607,10 +607,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,
......
......@@ -211,7 +211,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();
......@@ -222,14 +221,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));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment