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

Incremental step toward correct event propagation

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130509123
This commit is contained in:
olly 2016-08-17 05:24:36 -07:00 committed by Oliver Woodman
parent 317a8ef19b
commit fa84aa2123
2 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
View File

@ -74,7 +74,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
ExoPlayerImpl.this.handleEvent(msg); ExoPlayerImpl.this.handleEvent(msg);
} }
}; };
playbackInfo = new ExoPlayerImplInternal.PlaybackInfo(0); playbackInfo = new ExoPlayerImplInternal.PlaybackInfo(0, 0);
internalPlayer = new ExoPlayerImplInternal(renderers, trackSelector, loadControl, playWhenReady, internalPlayer = new ExoPlayerImplInternal(renderers, trackSelector, loadControl, playWhenReady,
eventHandler, playbackInfo); eventHandler, playbackInfo);
} }
@ -237,6 +237,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
case ExoPlayerImplInternal.MSG_SEEK_ACK: { case ExoPlayerImplInternal.MSG_SEEK_ACK: {
if (--pendingSeekAcks == 0) { if (--pendingSeekAcks == 0) {
playbackInfo = (ExoPlayerImplInternal.PlaybackInfo) msg.obj;
long positionMs = playbackInfo.startPositionUs == C.UNSET_TIME_US ? 0 long positionMs = playbackInfo.startPositionUs == C.UNSET_TIME_US ? 0
: playbackInfo.startPositionUs / 1000; : playbackInfo.startPositionUs / 1000;
if (playbackInfo.periodIndex != maskingPeriodIndex || positionMs != maskingPositionMs) { if (playbackInfo.periodIndex != maskingPeriodIndex || positionMs != maskingPositionMs) {
@ -248,8 +249,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
break; break;
} }
case ExoPlayerImplInternal.MSG_POSITION_DISCONTINUITY: { case ExoPlayerImplInternal.MSG_POSITION_DISCONTINUITY: {
playbackInfo = (ExoPlayerImplInternal.PlaybackInfo) msg.obj;
if (pendingSeekAcks == 0) { if (pendingSeekAcks == 0) {
playbackInfo = (ExoPlayerImplInternal.PlaybackInfo) msg.obj;
for (EventListener listener : listeners) { for (EventListener listener : listeners) {
listener.onPositionDiscontinuity(playbackInfo.periodIndex, listener.onPositionDiscontinuity(playbackInfo.periodIndex,
playbackInfo.startPositionUs / 1000); playbackInfo.startPositionUs / 1000);

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

@ -50,13 +50,16 @@ import java.io.IOException;
public static final class PlaybackInfo { public static final class PlaybackInfo {
public final int periodIndex; public final int periodIndex;
public final long startPositionUs;
public volatile long positionUs; public volatile long positionUs;
public volatile long bufferedPositionUs; public volatile long bufferedPositionUs;
public volatile long startPositionUs;
public PlaybackInfo(int periodIndex) { public PlaybackInfo(int periodIndex, long startPositionUs) {
this.periodIndex = periodIndex; this.periodIndex = periodIndex;
this.startPositionUs = startPositionUs;
positionUs = startPositionUs;
bufferedPositionUs = startPositionUs;
} }
} }
@ -336,9 +339,7 @@ import java.io.IOException;
throws ExoPlaybackException { throws ExoPlaybackException {
resetInternal(); resetInternal();
if (resetPosition) { if (resetPosition) {
playbackInfo = new PlaybackInfo(0); playbackInfo = new PlaybackInfo(0, C.UNSET_TIME_US);
playbackInfo.startPositionUs = C.UNSET_TIME_US;
playbackInfo.positionUs = C.UNSET_TIME_US;
} }
this.mediaSource = mediaSource; this.mediaSource = mediaSource;
mediaSource.prepareSource(this); mediaSource.prepareSource(this);
@ -509,28 +510,19 @@ import java.io.IOException;
// Seek position equals the current position. Do nothing. // Seek position equals the current position. Do nothing.
return; return;
} }
seekToPeriodPosition(periodIndex, positionUs); positionUs = seekToPeriodPosition(periodIndex, positionUs);
} finally { } finally {
eventHandler.sendEmptyMessage(MSG_SEEK_ACK); playbackInfo = new PlaybackInfo(periodIndex, positionUs);
eventHandler.obtainMessage(MSG_SEEK_ACK, playbackInfo).sendToTarget();
} }
} }
private void seekToPeriodPosition(int periodIndex, long positionUs) throws ExoPlaybackException { private long seekToPeriodPosition(int periodIndex, long positionUs) throws ExoPlaybackException {
if (periodIndex != playbackInfo.periodIndex) {
playbackInfo = new PlaybackInfo(periodIndex);
playbackInfo.startPositionUs = positionUs;
playbackInfo.positionUs = positionUs;
eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget();
} else {
playbackInfo.startPositionUs = positionUs;
playbackInfo.positionUs = positionUs;
}
if (mediaSource == null) { if (mediaSource == null) {
if (positionUs != C.UNSET_TIME_US) { if (positionUs != C.UNSET_TIME_US) {
resetInternalPosition(positionUs); resetInternalPosition(positionUs);
} }
return; return positionUs;
} }
stopRenderers(); stopRenderers();
@ -539,7 +531,7 @@ import java.io.IOException;
if (positionUs == C.UNSET_TIME_US if (positionUs == C.UNSET_TIME_US
|| (readingPeriod != playingPeriod && (periodIndex == playingPeriod.index || (readingPeriod != playingPeriod && (periodIndex == playingPeriod.index
|| (readingPeriod != null && periodIndex == readingPeriod.index)))) { || (readingPeriod != null && periodIndex == readingPeriod.index)))) {
// Clear the timeline because either the seek position is not known, or a renderer is reading // Clear the timeline because either the seek position is not known, or a renderer is reading
// ahead to the next period and the seek is to either the playing or reading period. // ahead to the next period and the seek is to either the playing or reading period.
periodIndex = Timeline.NO_PERIOD_INDEX; periodIndex = Timeline.NO_PERIOD_INDEX;
@ -577,8 +569,6 @@ import java.io.IOException;
loadingPeriod = playingPeriod; loadingPeriod = playingPeriod;
if (playingPeriod.hasEnabledTracks) { if (playingPeriod.hasEnabledTracks) {
positionUs = playingPeriod.mediaPeriod.seekToUs(positionUs); positionUs = playingPeriod.mediaPeriod.seekToUs(positionUs);
playbackInfo.startPositionUs = positionUs;
playbackInfo.positionUs = positionUs;
} }
resetInternalPosition(positionUs); resetInternalPosition(positionUs);
maybeContinueLoading(); maybeContinueLoading();
@ -592,6 +582,7 @@ import java.io.IOException;
} }
updatePlaybackPositions(); updatePlaybackPositions();
handler.sendEmptyMessage(MSG_DO_SOME_WORK); handler.sendEmptyMessage(MSG_DO_SOME_WORK);
return positionUs;
} }
private void resetInternalPosition(long periodPositionUs) throws ExoPlaybackException { private void resetInternalPosition(long periodPositionUs) throws ExoPlaybackException {
@ -821,11 +812,16 @@ import java.io.IOException;
MediaSource.Position defaultStartPosition = MediaSource.Position defaultStartPosition =
mediaSource.getDefaultStartPosition(newPlayingPeriodIndex); mediaSource.getDefaultStartPosition(newPlayingPeriodIndex);
long newPlayingPositionUs;
if (defaultStartPosition != null) { if (defaultStartPosition != null) {
seekToPeriodPosition(defaultStartPosition.periodIndex, defaultStartPosition.positionUs); newPlayingPeriodIndex = defaultStartPosition.periodIndex;
newPlayingPositionUs = seekToPeriodPosition(defaultStartPosition.periodIndex,
defaultStartPosition.positionUs);
} else { } else {
seekToPeriodPosition(newPlayingPeriodIndex, C.UNSET_TIME_US); newPlayingPositionUs = seekToPeriodPosition(newPlayingPeriodIndex, C.UNSET_TIME_US);
} }
playbackInfo = new PlaybackInfo(newPlayingPeriodIndex, newPlayingPositionUs);
eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget();
return; return;
} }
@ -842,13 +838,17 @@ import java.io.IOException;
if (!period.id.equals(timeline.getPeriodId(index))) { if (!period.id.equals(timeline.getPeriodId(index))) {
if (!seenReadingPeriod) { if (!seenReadingPeriod) {
// Renderers may have read a period that has been removed, so release all loaded periods // Renderers may have read a period that has been removed, so release all loaded periods
// and seek to the playing period index. // and seek to the current position of the playing period index.
index = playingPeriod.index; index = playingPeriod.index;
releasePeriodsFrom(playingPeriod); releasePeriodsFrom(playingPeriod);
playingPeriod = null; playingPeriod = null;
readingPeriod = null; readingPeriod = null;
loadingPeriod = null; loadingPeriod = null;
seekToPeriodPosition(index, 0); long newPositionUs = seekToPeriodPosition(index, playbackInfo.positionUs);
if (newPositionUs != playbackInfo.positionUs) {
playbackInfo = new PlaybackInfo(index, newPositionUs);
eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget();
}
return; return;
} }
@ -886,9 +886,7 @@ import java.io.IOException;
: loadingPeriod != null ? loadingPeriod.index : Timeline.NO_PERIOD_INDEX; : loadingPeriod != null ? loadingPeriod.index : Timeline.NO_PERIOD_INDEX;
if (newPlayingIndex != Timeline.NO_PERIOD_INDEX if (newPlayingIndex != Timeline.NO_PERIOD_INDEX
&& newPlayingIndex != playbackInfo.periodIndex) { && newPlayingIndex != playbackInfo.periodIndex) {
long oldPositionUs = playbackInfo.positionUs; playbackInfo = new PlaybackInfo(newPlayingIndex, playbackInfo.positionUs);
playbackInfo = new PlaybackInfo(newPlayingIndex);
playbackInfo.startPositionUs = oldPositionUs;
updatePlaybackPositions(); updatePlaybackPositions();
eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget(); eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget();
} }
@ -963,8 +961,7 @@ import java.io.IOException;
playingPeriod.release(); playingPeriod.release();
setPlayingPeriod(playingPeriod.nextPeriod); setPlayingPeriod(playingPeriod.nextPeriod);
bufferAheadPeriodCount--; bufferAheadPeriodCount--;
playbackInfo = new PlaybackInfo(playingPeriod.index); playbackInfo = new PlaybackInfo(playingPeriod.index, playingPeriod.startPositionUs);
playbackInfo.startPositionUs = playingPeriod.startPositionUs;
updatePlaybackPositions(); updatePlaybackPositions();
eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget(); eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget();
} }
@ -1022,8 +1019,7 @@ import java.io.IOException;
setPlayingPeriod(readingPeriod); setPlayingPeriod(readingPeriod);
if (playbackInfo.startPositionUs == C.UNSET_TIME_US) { if (playbackInfo.startPositionUs == C.UNSET_TIME_US) {
// Update the playback info when seeking to a default position. // Update the playback info when seeking to a default position.
playbackInfo = new PlaybackInfo(playingPeriod.index); playbackInfo = new PlaybackInfo(playingPeriod.index, playingPeriod.startPositionUs);
playbackInfo.startPositionUs = playingPeriod.startPositionUs;
resetInternalPosition(playbackInfo.startPositionUs); resetInternalPosition(playbackInfo.startPositionUs);
updatePlaybackPositions(); updatePlaybackPositions();
eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget(); eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget();