Skip to content

SDK / exoplayer

Go to a project
Commit 4a6ba35f by bachinger Committed by microkatz
Options

Use correct period duration in fake live timeline 

PiperOrigin-RevId: 517953981
parent 7f4fdb63
Inline Side-by-side
Showing with 10 additions and 10 deletions
library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
...@@ -587,10 +587,10 @@ public final class MediaPeriodQueueTest { ...@@ -587,10 +587,10 @@ public final class MediaPeriodQueueTest {
advance(); advance();
assertGetNextMediaPeriodInfoReturnsContentMediaPeriod( assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
new Pair<Object, Object>(((Pair<Object, Object>) firstPeriodUid).first, "uid-4[a]"), new Pair<Object, Object>(((Pair<Object, Object>) firstPeriodUid).first, "uid-4[a]"),
/* startPositionUs= */ 0, /* startPositionUs= */ adPeriodDurationUs,
/* requestedContentPositionUs= */ 0, /* requestedContentPositionUs= */ 0,
/* endPositionUs= */ 0, /* endPositionUs= */ adPeriodDurationUs,
/* durationUs= */ 0, /* durationUs= */ adPeriodDurationUs,
/* isFollowedByTransitionToSameStream= */ false, /* isFollowedByTransitionToSameStream= */ false,
/* isLastInPeriod= */ true, /* isLastInPeriod= */ true,
/* isLastInWindow= */ false, /* isLastInWindow= */ false,
...@@ -607,10 +607,10 @@ public final class MediaPeriodQueueTest { ...@@ -607,10 +607,10 @@ public final class MediaPeriodQueueTest {
advance(); advance();
assertGetNextMediaPeriodInfoReturnsContentMediaPeriod( assertGetNextMediaPeriodInfoReturnsContentMediaPeriod(
new Pair<Object, Object>(((Pair<Object, Object>) firstPeriodUid).first, "uid-5[a]"), new Pair<Object, Object>(((Pair<Object, Object>) firstPeriodUid).first, "uid-5[a]"),
/* startPositionUs= */ 0, /* startPositionUs= */ adPeriodDurationUs,
/* requestedContentPositionUs= */ 0, /* requestedContentPositionUs= */ 0,
/* endPositionUs= */ 0, /* endPositionUs= */ adPeriodDurationUs,
/* durationUs= */ 0, /* durationUs= */ adPeriodDurationUs,
/* isFollowedByTransitionToSameStream= */ false, /* isFollowedByTransitionToSameStream= */ false,
/* isLastInPeriod= */ true, /* isLastInPeriod= */ true,
/* isLastInWindow= */ false, /* isLastInWindow= */ false,
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMultiPeriodLiveTimeline.java
...@@ -211,7 +211,6 @@ public class FakeMultiPeriodLiveTimeline extends Timeline { ...@@ -211,7 +211,6 @@ public class FakeMultiPeriodLiveTimeline extends Timeline {
while (lastPeriodStartTimeUs < now) { while (lastPeriodStartTimeUs < now) {
isAd = adSequencePattern[lastPeriodIndex % sequencePeriodCount]; isAd = adSequencePattern[lastPeriodIndex % sequencePeriodCount];
long periodDurationUs = isAd ? AD_PERIOD_DURATION_US : PERIOD_DURATION_US; long periodDurationUs = isAd ? AD_PERIOD_DURATION_US : PERIOD_DURATION_US;
long adPeriodDurationUs = periodDurationUs;
AdPlaybackState adPlaybackState = AdPlaybackState.NONE; AdPlaybackState adPlaybackState = AdPlaybackState.NONE;
if (!isContentTimeline) { if (!isContentTimeline) {
adPlaybackState = new AdPlaybackState("adsId").withLivePostrollPlaceholderAppended(); adPlaybackState = new AdPlaybackState("adsId").withLivePostrollPlaceholderAppended();
...@@ -222,14 +221,15 @@ public class FakeMultiPeriodLiveTimeline extends Timeline { ...@@ -222,14 +221,15 @@ public class FakeMultiPeriodLiveTimeline extends Timeline {
.withIsServerSideInserted(/* adGroupIndex= */ 0, /* isServerSideInserted= */ true) .withIsServerSideInserted(/* adGroupIndex= */ 0, /* isServerSideInserted= */ true)
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)
.withAdDurationsUs( .withAdDurationsUs(
/* adGroupIndex= */ 0, /* adDurationsUs...= */ periodDurationUs); /* adGroupIndex= */ 0, /* adDurationsUs...= */ periodDurationUs)
adPeriodDurationUs = 0; .withContentResumeOffsetUs(
/* adGroupIndex= */ 0, /* contentResumeOffsetUs= */ periodDurationUs);
} }
} }
liveWindow.add( liveWindow.add(
new PeriodData( new PeriodData(
/* id= */ lastPeriodIndex++, /* id= */ lastPeriodIndex++,
adPeriodDurationUs, periodDurationUs,
/* positionInWindowUs= */ lastPeriodStartTimeUs - windowStartTimeUs, /* positionInWindowUs= */ lastPeriodStartTimeUs - windowStartTimeUs,
isAd, isAd,
adPlaybackState)); 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