loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct period duration in fake live timeline

Browse Source 
PiperOrigin-RevId: 517953981
This commit is contained in:
bachinger 2023-03-20 13:52:05 +00:00 committed by microkatz
parent ccdbd3b0a3
commit b13b272695
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaPeriodQueueTest.java
View File

@ -593,10 +593,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,
@ -613,10 +613,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,

8
libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeMultiPeriodLiveTimeline.java
View File

@ -213,7 +213,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();
@ -224,14 +223,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));