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

Removes liveOffsetTarget override on seek to live edge

Browse Source 
Any calls that issue a `seekTo()` where the position is `TIME_UNSET` will
now restore the live offset target to the MediaItem set default.

The change simply passes a flag to `updatePlaybackSpeedSettingsForNewPeriod()` that
indicates the call is from a seek operation.  If this flag is set, a `positionForTargetOffsetOverrideUs`
of `TIME_UNSET` unconditionally removes the `setTargetLiveOffsetOverrideUs()`

This fixes issue #11050
This commit is contained in:
Steve Mayhew 2023-03-09 15:50:47 -08:00
parent d88dd74b2b
commit f2cf82cd15
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
View File

@ -1248,7 +1248,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
/* newPeriodId= */ periodId, /* newPeriodId= */ periodId,
/* oldTimeline= */ playbackInfo.timeline, /* oldTimeline= */ playbackInfo.timeline,
/* oldPeriodId= */ playbackInfo.periodId, /* oldPeriodId= */ playbackInfo.periodId,
/* positionForTargetOffsetOverrideUs= */ requestedContentPositionUs); /* positionForTargetOffsetOverrideUs= */ requestedContentPositionUs,
/* positionRequestedBySeek */true);
} }
} finally { } finally {
playbackInfo = playbackInfo =
@ -1897,7 +1899,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
/* oldPeriodId= */ playbackInfo.periodId, /* oldPeriodId= */ playbackInfo.periodId,
/* positionForTargetOffsetOverrideUs */ positionUpdate.setTargetLiveOffset /* positionForTargetOffsetOverrideUs */ positionUpdate.setTargetLiveOffset
? newPositionUs ? newPositionUs
: C.TIME_UNSET); : C.TIME_UNSET,
/* positionRequestedBySeek */false);
if (periodPositionChanged if (periodPositionChanged
|| newRequestedContentPositionUs != playbackInfo.requestedContentPositionUs) { || newRequestedContentPositionUs != playbackInfo.requestedContentPositionUs) {
Object oldPeriodUid = playbackInfo.periodId.periodUid; Object oldPeriodUid = playbackInfo.periodId.periodUid;
@ -1935,7 +1938,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
MediaPeriodId newPeriodId, MediaPeriodId newPeriodId,
Timeline oldTimeline, Timeline oldTimeline,
MediaPeriodId oldPeriodId, MediaPeriodId oldPeriodId,
long positionForTargetOffsetOverrideUs) long positionForTargetOffsetOverrideUs,
boolean positionRequestedBySeek)
throws ExoPlaybackException { throws ExoPlaybackException {
if (!shouldUseLivePlaybackSpeedControl(newTimeline, newPeriodId)) { if (!shouldUseLivePlaybackSpeedControl(newTimeline, newPeriodId)) {
// Live playback speed control is unused for the current period, reset speed to user-defined // Live playback speed control is unused for the current period, reset speed to user-defined
@ -1965,8 +1969,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
int oldWindowIndex = oldTimeline.getPeriodByUid(oldPeriodId.periodUid, period).windowIndex; int oldWindowIndex = oldTimeline.getPeriodByUid(oldPeriodId.periodUid, period).windowIndex;
oldWindowUid = oldTimeline.getWindow(oldWindowIndex, window).uid; oldWindowUid = oldTimeline.getWindow(oldWindowIndex, window).uid;
} }
if (!Util.areEqual(oldWindowUid, windowUid)) { if (!Util.areEqual(oldWindowUid, windowUid) || positionRequestedBySeek) {
// Reset overridden target live offset to media values if window changes. // Reset overridden target live offset to media values if window changes or if seekTo
// default live position.
livePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(C.TIME_UNSET); livePlaybackSpeedControl.setTargetLiveOffsetOverrideUs(C.TIME_UNSET);
} }
} }
@ -2089,7 +2094,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
/* newPeriodId= */ readingPeriodHolder.info.id, /* newPeriodId= */ readingPeriodHolder.info.id,
/* oldTimeline= */ playbackInfo.timeline, /* oldTimeline= */ playbackInfo.timeline,
/* oldPeriodId= */ oldReadingPeriodHolder.info.id, /* oldPeriodId= */ oldReadingPeriodHolder.info.id,
/* positionForTargetOffsetOverrideUs= */ C.TIME_UNSET); /* positionForTargetOffsetOverrideUs= */ C.TIME_UNSET,
/* positionRequestedBySeek */false);
if (readingPeriodHolder.prepared if (readingPeriodHolder.prepared
&& readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET) { && readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET) {