loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-07 23:50:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

updateQueuedPeriods(): If known duration changed for a media period, remove all media periods after

Browse Source 
PiperOrigin-RevId: 223603915
This commit is contained in:
olly 2018-12-01 02:01:20 +00:00 committed by Oliver Woodman
parent ffbb0da893
commit 24f2cbb215
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
View File

@ -307,7 +307,11 @@ import com.google.android.exoplayer2.util.Assertions;
MediaPeriodHolder periodHolder = getFrontPeriod(); MediaPeriodHolder periodHolder = getFrontPeriod();
while (periodHolder != null) { while (periodHolder != null) {
if (previousPeriodHolder == null) { if (previousPeriodHolder == null) {
long previousDurationUs = periodHolder.info.durationUs;
periodHolder.info = getUpdatedMediaPeriodInfo(periodHolder.info); periodHolder.info = getUpdatedMediaPeriodInfo(periodHolder.info);
if (!canKeepAfterMediaPeriodHolder(periodHolder, previousDurationUs)) {
return !removeAfter(periodHolder);
}
} else { } else {
// Check this period holder still follows the previous one, based on the new timeline. // Check this period holder still follows the previous one, based on the new timeline.
if (periodIndex == C.INDEX_UNSET if (periodIndex == C.INDEX_UNSET
@ -326,6 +330,8 @@ import com.google.android.exoplayer2.util.Assertions;
// Check the media period information matches the new timeline. // Check the media period information matches the new timeline.
if (!canKeepMediaPeriodHolder(periodHolder, periodInfo)) { if (!canKeepMediaPeriodHolder(periodHolder, periodInfo)) {
return !removeAfter(previousPeriodHolder); return !removeAfter(previousPeriodHolder);
} else if (!canKeepAfterMediaPeriodHolder(periodHolder, periodInfo.durationUs)) {
return !removeAfter(periodHolder);
} }
} }
@ -468,6 +474,15 @@ import com.google.android.exoplayer2.util.Assertions;
&& periodHolderInfo.id.equals(info.id); && periodHolderInfo.id.equals(info.id);
} }
/**
* Returns whether periods after {@code periodHolder} can be kept for playing given its previous
* duration.
*/
private boolean canKeepAfterMediaPeriodHolder(
MediaPeriodHolder periodHolder, long previousDurationUs) {
return previousDurationUs == C.TIME_UNSET || previousDurationUs == periodHolder.info.durationUs;
}
/** /**
* Updates the queue for any playback mode change, and returns whether the change was fully * Updates the queue for any playback mode change, and returns whether the change was fully
* handled. If not, it is necessary to seek to the current playback position. * handled. If not, it is necessary to seek to the current playback position.