loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-03 21:57:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better handle duration + disabled renderers

Browse Source 
- Fix bug where duration of initially disabled tracks wasn't correctly
  incorporated into the overall duration reported by the player.
- Don't transition to STATE_ENDED unless the position has reached the
  duration, if the duration is known. This allows for "playback" to
  continue when all renderers are disabled, rather than jumping straight
  to STATE_ENDED.
This commit is contained in:
Oliver Woodman 2015-06-18 14:21:32 +01:00
parent 9de1bb7a01
commit 0ee8c07fe5
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java
View File

@ -278,15 +278,11 @@ import java.util.List;
} }
long durationUs = 0; long durationUs = 0;
boolean isEnded = true; boolean allRenderersEnded = true;
boolean allRenderersReadyOrEnded = true; boolean allRenderersReadyOrEnded = true;
for (int i = 0; i < renderers.length; i++) { for (int i = 0; i < renderers.length; i++) {
TrackRenderer renderer = renderers[i]; TrackRenderer renderer = renderers[i];
if (rendererEnabledFlags[i] && renderer.getState() == TrackRenderer.STATE_PREPARED) { if (renderer.getState() == TrackRenderer.STATE_PREPARED) {
renderer.enable(positionUs, false);
enabledRenderers.add(renderer);
isEnded = isEnded && renderer.isEnded();
allRenderersReadyOrEnded = allRenderersReadyOrEnded && rendererReadyOrEnded(renderer);
if (durationUs == TrackRenderer.UNKNOWN_TIME_US) { if (durationUs == TrackRenderer.UNKNOWN_TIME_US) {
// We've already encountered a track for which the duration is unknown, so the media // We've already encountered a track for which the duration is unknown, so the media
// duration is unknown regardless of the duration of this track. // duration is unknown regardless of the duration of this track.
@ -300,11 +296,18 @@ import java.util.List;
durationUs = Math.max(durationUs, trackDurationUs); durationUs = Math.max(durationUs, trackDurationUs);
} }
} }
if (rendererEnabledFlags[i]) {
renderer.enable(positionUs, false);
enabledRenderers.add(renderer);
allRenderersEnded = allRenderersEnded && renderer.isEnded();
allRenderersReadyOrEnded = allRenderersReadyOrEnded && rendererReadyOrEnded(renderer);
}
} }
} }
this.durationUs = durationUs; this.durationUs = durationUs;
if (isEnded) { if (allRenderersEnded
&& (durationUs == TrackRenderer.UNKNOWN_TIME_US || durationUs <= positionUs)) {
// We don't expect this case, but handle it anyway. // We don't expect this case, but handle it anyway.
setState(ExoPlayer.STATE_ENDED); setState(ExoPlayer.STATE_ENDED);
} else { } else {
@ -390,7 +393,7 @@ import java.util.List;
long operationStartTimeMs = SystemClock.elapsedRealtime(); long operationStartTimeMs = SystemClock.elapsedRealtime();
long bufferedPositionUs = durationUs != TrackRenderer.UNKNOWN_TIME_US ? durationUs long bufferedPositionUs = durationUs != TrackRenderer.UNKNOWN_TIME_US ? durationUs
: Long.MAX_VALUE; : Long.MAX_VALUE;
boolean isEnded = true; boolean allRenderersEnded = true;
boolean allRenderersReadyOrEnded = true; boolean allRenderersReadyOrEnded = true;
updatePositionUs(); updatePositionUs();
for (int i = 0; i < enabledRenderers.size(); i++) { for (int i = 0; i < enabledRenderers.size(); i++) {
@ -399,7 +402,7 @@ import java.util.List;
// invoked again. The minimum of these values should then be used as the delay before the next // invoked again. The minimum of these values should then be used as the delay before the next
// invocation of this method. // invocation of this method.
renderer.doSomeWork(positionUs, elapsedRealtimeUs); renderer.doSomeWork(positionUs, elapsedRealtimeUs);
isEnded = isEnded && renderer.isEnded(); allRenderersEnded = allRenderersEnded && renderer.isEnded();
allRenderersReadyOrEnded = allRenderersReadyOrEnded && rendererReadyOrEnded(renderer); allRenderersReadyOrEnded = allRenderersReadyOrEnded && rendererReadyOrEnded(renderer);
if (bufferedPositionUs == TrackRenderer.UNKNOWN_TIME_US) { if (bufferedPositionUs == TrackRenderer.UNKNOWN_TIME_US) {
@ -422,7 +425,8 @@ import java.util.List;
} }
this.bufferedPositionUs = bufferedPositionUs; this.bufferedPositionUs = bufferedPositionUs;
if (isEnded) { if (allRenderersEnded
&& (durationUs == TrackRenderer.UNKNOWN_TIME_US || durationUs <= positionUs)) {
setState(ExoPlayer.STATE_ENDED); setState(ExoPlayer.STATE_ENDED);
stopRenderers(); stopRenderers();
} else if (state == ExoPlayer.STATE_BUFFERING && allRenderersReadyOrEnded) { } else if (state == ExoPlayer.STATE_BUFFERING && allRenderersReadyOrEnded) {