Skip to content

SDK / exoplayer

Go to a project
Commit 371f675a by olly Committed by Oliver Woodman
Options

Fix missing source info refresh notification 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164502580
parent e713ddc2
Inline Side-by-side
Showing with 19 additions and 10 deletions
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
...@@ -975,11 +975,10 @@ import java.io.IOException; ...@@ -975,11 +975,10 @@ import java.io.IOException;
mediaPeriodInfoSequence.setTimeline(timeline); mediaPeriodInfoSequence.setTimeline(timeline);
Object manifest = timelineAndManifest.second; Object manifest = timelineAndManifest.second;
int processedInitialSeekCount = 0;
if (oldTimeline == null) { if (oldTimeline == null) {
if (pendingInitialSeekCount > 0) { if (pendingInitialSeekCount > 0) {
Pair<Integer, Long> periodPosition = resolveSeekPosition(pendingSeekPosition); Pair<Integer, Long> periodPosition = resolveSeekPosition(pendingSeekPosition);
processedInitialSeekCount = pendingInitialSeekCount; int processedInitialSeekCount = pendingInitialSeekCount;
pendingInitialSeekCount = 0; pendingInitialSeekCount = 0;
pendingSeekPosition = null; pendingSeekPosition = null;
if (periodPosition == null) { if (periodPosition == null) {
...@@ -996,7 +995,7 @@ import java.io.IOException; ...@@ -996,7 +995,7 @@ import java.io.IOException;
} }
} else if (playbackInfo.startPositionUs == C.TIME_UNSET) { } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
if (timeline.isEmpty()) { if (timeline.isEmpty()) {
handleSourceInfoRefreshEndedPlayback(manifest, processedInitialSeekCount); handleSourceInfoRefreshEndedPlayback(manifest);
} else { } else {
Pair<Integer, Long> defaultPosition = getPeriodPosition(0, C.TIME_UNSET); Pair<Integer, Long> defaultPosition = getPeriodPosition(0, C.TIME_UNSET);
int periodIndex = defaultPosition.first; int periodIndex = defaultPosition.first;
...@@ -1005,8 +1004,10 @@ import java.io.IOException; ...@@ -1005,8 +1004,10 @@ import java.io.IOException;
startPositionUs); startPositionUs);
playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : startPositionUs, playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : startPositionUs,
startPositionUs); startPositionUs);
notifySourceInfoRefresh(manifest, processedInitialSeekCount); notifySourceInfoRefresh(manifest);
} }
} else {
notifySourceInfoRefresh(manifest);
} }
return; return;
} }
...@@ -1015,7 +1016,7 @@ import java.io.IOException; ...@@ -1015,7 +1016,7 @@ import java.io.IOException;
MediaPeriodHolder periodHolder = playingPeriodHolder != null ? playingPeriodHolder MediaPeriodHolder periodHolder = playingPeriodHolder != null ? playingPeriodHolder
: loadingPeriodHolder; : loadingPeriodHolder;
if (periodHolder == null && playingPeriodIndex >= oldTimeline.getPeriodCount()) { if (periodHolder == null && playingPeriodIndex >= oldTimeline.getPeriodCount()) {
notifySourceInfoRefresh(manifest, processedInitialSeekCount); notifySourceInfoRefresh(manifest);
return; return;
} }
Object playingPeriodUid = periodHolder == null Object playingPeriodUid = periodHolder == null
...@@ -1027,7 +1028,7 @@ import java.io.IOException; ...@@ -1027,7 +1028,7 @@ import java.io.IOException;
int newPeriodIndex = resolveSubsequentPeriod(playingPeriodIndex, oldTimeline, timeline); int newPeriodIndex = resolveSubsequentPeriod(playingPeriodIndex, oldTimeline, timeline);
if (newPeriodIndex == C.INDEX_UNSET) { if (newPeriodIndex == C.INDEX_UNSET) {
// We failed to resolve a suitable restart position. // We failed to resolve a suitable restart position.
handleSourceInfoRefreshEndedPlayback(manifest, processedInitialSeekCount); handleSourceInfoRefreshEndedPlayback(manifest);
return; return;
} }
// We resolved a subsequent period. Seek to the default position in the corresponding window. // We resolved a subsequent period. Seek to the default position in the corresponding window.
...@@ -1055,7 +1056,7 @@ import java.io.IOException; ...@@ -1055,7 +1056,7 @@ import java.io.IOException;
MediaPeriodId periodId = new MediaPeriodId(newPeriodIndex); MediaPeriodId periodId = new MediaPeriodId(newPeriodIndex);
newPositionUs = seekToPeriodPosition(periodId, newPositionUs); newPositionUs = seekToPeriodPosition(periodId, newPositionUs);
playbackInfo = new PlaybackInfo(periodId, newPositionUs); playbackInfo = new PlaybackInfo(periodId, newPositionUs);
notifySourceInfoRefresh(manifest, processedInitialSeekCount); notifySourceInfoRefresh(manifest);
return; return;
} }
...@@ -1072,14 +1073,14 @@ import java.io.IOException; ...@@ -1072,14 +1073,14 @@ import java.io.IOException;
long newPositionUs = seekToPeriodPosition(periodId, playbackInfo.contentPositionUs); long newPositionUs = seekToPeriodPosition(periodId, playbackInfo.contentPositionUs);
long contentPositionUs = periodId.isAd() ? playbackInfo.contentPositionUs : C.TIME_UNSET; long contentPositionUs = periodId.isAd() ? playbackInfo.contentPositionUs : C.TIME_UNSET;
playbackInfo = new PlaybackInfo(periodId, newPositionUs, contentPositionUs); playbackInfo = new PlaybackInfo(periodId, newPositionUs, contentPositionUs);
notifySourceInfoRefresh(manifest, processedInitialSeekCount); notifySourceInfoRefresh(manifest);
return; return;
} }
} }
if (periodHolder == null) { if (periodHolder == null) {
// We don't have any period holders, so we're done. // We don't have any period holders, so we're done.
notifySourceInfoRefresh(manifest, processedInitialSeekCount); notifySourceInfoRefresh(manifest);
return; return;
} }
...@@ -1117,7 +1118,7 @@ import java.io.IOException; ...@@ -1117,7 +1118,7 @@ import java.io.IOException;
} }
} }
notifySourceInfoRefresh(manifest, processedInitialSeekCount); notifySourceInfoRefresh(manifest);
} }
private MediaPeriodHolder updatePeriodInfo(MediaPeriodHolder periodHolder, int periodIndex) { private MediaPeriodHolder updatePeriodInfo(MediaPeriodHolder periodHolder, int periodIndex) {
...@@ -1131,6 +1132,10 @@ import java.io.IOException; ...@@ -1131,6 +1132,10 @@ import java.io.IOException;
} }
} }
private void handleSourceInfoRefreshEndedPlayback(Object manifest) {
handleSourceInfoRefreshEndedPlayback(manifest, 0);
}
private void handleSourceInfoRefreshEndedPlayback(Object manifest, private void handleSourceInfoRefreshEndedPlayback(Object manifest,
int processedInitialSeekCount) { int processedInitialSeekCount) {
// Set the playback position to (0,0) for notifying the eventHandler. // Set the playback position to (0,0) for notifying the eventHandler.
...@@ -1143,6 +1148,10 @@ import java.io.IOException; ...@@ -1143,6 +1148,10 @@ import java.io.IOException;
resetInternal(false); resetInternal(false);
} }
private void notifySourceInfoRefresh(Object manifest) {
notifySourceInfoRefresh(manifest, 0);
}
private void notifySourceInfoRefresh(Object manifest, int processedInitialSeekCount) { private void notifySourceInfoRefresh(Object manifest, int processedInitialSeekCount) {
eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED, eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED,
new SourceInfo(timeline, manifest, playbackInfo, processedInitialSeekCount)).sendToTarget(); new SourceInfo(timeline, manifest, playbackInfo, processedInitialSeekCount)).sendToTarget();
......
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