Commit 270f68a9 by olly Committed by Oliver Woodman

Add convenience methods to query current window

- Support querying whether the current window is dynamic
  and seekable. The new methods are similar to getDuration,
  which is also a convenience method for the current window.
- Improve demo app to restore positions in VOD items within
  playlists where the last item is live. Also restore the
  position within the window for live items unless the player
  failed with BehindLiveWindowException.

Issue: #2320

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=144443898
parent ca7febe4
...@@ -45,6 +45,7 @@ import com.google.android.exoplayer2.drm.UnsupportedDrmException; ...@@ -45,6 +45,7 @@ import com.google.android.exoplayer2.drm.UnsupportedDrmException;
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
import com.google.android.exoplayer2.mediacodec.MediaCodecRenderer.DecoderInitializationException; import com.google.android.exoplayer2.mediacodec.MediaCodecRenderer.DecoderInitializationException;
import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException; import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
import com.google.android.exoplayer2.source.BehindLiveWindowException;
import com.google.android.exoplayer2.source.ConcatenatingMediaSource; import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.source.ExtractorMediaSource;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
...@@ -100,7 +101,6 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -100,7 +101,6 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
} }
private Handler mainHandler; private Handler mainHandler;
private Timeline.Window window;
private EventLogger eventLogger; private EventLogger eventLogger;
private SimpleExoPlayerView simpleExoPlayerView; private SimpleExoPlayerView simpleExoPlayerView;
private LinearLayout debugRootView; private LinearLayout debugRootView;
...@@ -115,9 +115,8 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -115,9 +115,8 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
private boolean playerNeedsSource; private boolean playerNeedsSource;
private boolean shouldAutoPlay; private boolean shouldAutoPlay;
private boolean isTimelineStatic; private int resumeWindow;
private int playerWindow; private long resumePosition;
private long playerPosition;
// Activity lifecycle // Activity lifecycle
...@@ -125,9 +124,9 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -125,9 +124,9 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
shouldAutoPlay = true; shouldAutoPlay = true;
clearResumePosition();
mediaDataSourceFactory = buildDataSourceFactory(true); mediaDataSourceFactory = buildDataSourceFactory(true);
mainHandler = new Handler(); mainHandler = new Handler();
window = new Timeline.Window();
if (CookieHandler.getDefault() != DEFAULT_COOKIE_MANAGER) { if (CookieHandler.getDefault() != DEFAULT_COOKIE_MANAGER) {
CookieHandler.setDefault(DEFAULT_COOKIE_MANAGER); CookieHandler.setDefault(DEFAULT_COOKIE_MANAGER);
} }
...@@ -148,7 +147,8 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -148,7 +147,8 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
@Override @Override
public void onNewIntent(Intent intent) { public void onNewIntent(Intent intent) {
releasePlayer(); releasePlayer();
isTimelineStatic = false; shouldAutoPlay = true;
clearResumePosition();
setIntent(intent); setIntent(intent);
} }
...@@ -264,7 +264,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -264,7 +264,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
@SimpleExoPlayer.ExtensionRendererMode int extensionRendererMode = @SimpleExoPlayer.ExtensionRendererMode int extensionRendererMode =
((DemoApplication) getApplication()).useExtensionRenderers() ((DemoApplication) getApplication()).useExtensionRenderers()
? (preferExtensionDecoders ? SimpleExoPlayer.EXTENSION_RENDERER_MODE_PREFER ? (preferExtensionDecoders ? SimpleExoPlayer.EXTENSION_RENDERER_MODE_PREFER
: SimpleExoPlayer.EXTENSION_RENDERER_MODE_ON) : SimpleExoPlayer.EXTENSION_RENDERER_MODE_ON)
: SimpleExoPlayer.EXTENSION_RENDERER_MODE_OFF; : SimpleExoPlayer.EXTENSION_RENDERER_MODE_OFF;
TrackSelection.Factory videoTrackSelectionFactory = TrackSelection.Factory videoTrackSelectionFactory =
new AdaptiveVideoTrackSelection.Factory(BANDWIDTH_METER); new AdaptiveVideoTrackSelection.Factory(BANDWIDTH_METER);
...@@ -281,13 +281,6 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -281,13 +281,6 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
player.setMetadataOutput(eventLogger); player.setMetadataOutput(eventLogger);
simpleExoPlayerView.setPlayer(player); simpleExoPlayerView.setPlayer(player);
if (isTimelineStatic) {
if (playerPosition == C.TIME_UNSET) {
player.seekToDefaultPosition(playerWindow);
} else {
player.seekTo(playerWindow, playerPosition);
}
}
player.setPlayWhenReady(shouldAutoPlay); player.setPlayWhenReady(shouldAutoPlay);
debugViewHelper = new DebugTextViewHelper(player, debugTextView); debugViewHelper = new DebugTextViewHelper(player, debugTextView);
debugViewHelper.start(); debugViewHelper.start();
...@@ -324,7 +317,8 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -324,7 +317,8 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
} }
MediaSource mediaSource = mediaSources.length == 1 ? mediaSources[0] MediaSource mediaSource = mediaSources.length == 1 ? mediaSources[0]
: new ConcatenatingMediaSource(mediaSources); : new ConcatenatingMediaSource(mediaSources);
player.prepare(mediaSource, !isTimelineStatic, !isTimelineStatic); player.seekTo(resumeWindow, resumePosition);
player.prepare(mediaSource, false, false);
playerNeedsSource = false; playerNeedsSource = false;
updateButtonVisibilities(); updateButtonVisibilities();
} }
...@@ -367,12 +361,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -367,12 +361,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
debugViewHelper.stop(); debugViewHelper.stop();
debugViewHelper = null; debugViewHelper = null;
shouldAutoPlay = player.getPlayWhenReady(); shouldAutoPlay = player.getPlayWhenReady();
playerWindow = player.getCurrentWindowIndex(); updateResumePosition();
playerPosition = C.TIME_UNSET;
Timeline timeline = player.getCurrentTimeline();
if (!timeline.isEmpty() && timeline.getWindow(playerWindow, window).isSeekable) {
playerPosition = player.getCurrentPosition();
}
player.release(); player.release();
player = null; player = null;
trackSelector = null; trackSelector = null;
...@@ -381,6 +370,17 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -381,6 +370,17 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
} }
} }
private void updateResumePosition() {
resumeWindow = player.getCurrentWindowIndex();
resumePosition = player.isCurrentWindowSeekable() ? Math.max(0, player.getCurrentPosition())
: C.TIME_UNSET;
}
private void clearResumePosition() {
resumeWindow = 0;
resumePosition = C.TIME_UNSET;
}
/** /**
* Returns a new DataSource factory. * Returns a new DataSource factory.
* *
...@@ -427,8 +427,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -427,8 +427,7 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
@Override @Override
public void onTimelineChanged(Timeline timeline, Object manifest) { public void onTimelineChanged(Timeline timeline, Object manifest) {
isTimelineStatic = !timeline.isEmpty() // Do nothing.
&& !timeline.getWindow(timeline.getWindowCount() - 1, window).isDynamic;
} }
@Override @Override
...@@ -460,6 +459,11 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -460,6 +459,11 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
showToast(errorString); showToast(errorString);
} }
playerNeedsSource = true; playerNeedsSource = true;
if (isBehindLiveWindow(e)) {
clearResumePosition();
} else {
updateResumePosition();
}
updateButtonVisibilities(); updateButtonVisibilities();
showControls(); showControls();
} }
...@@ -535,4 +539,18 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay ...@@ -535,4 +539,18 @@ public class PlayerActivity extends Activity implements OnClickListener, ExoPlay
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show(); Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show();
} }
private static boolean isBehindLiveWindow(ExoPlaybackException e) {
if (e.type != ExoPlaybackException.TYPE_SOURCE) {
return false;
}
Throwable cause = e.getSourceException();
while (cause != null) {
if (cause instanceof BehindLiveWindowException) {
return true;
}
cause = cause.getCause();
}
return false;
}
} }
...@@ -447,4 +447,20 @@ public interface ExoPlayer { ...@@ -447,4 +447,20 @@ public interface ExoPlayer {
*/ */
int getBufferedPercentage(); int getBufferedPercentage();
/**
* Returns whether the current window is dynamic, or {@code false} if the {@link Timeline} is
* empty.
*
* @see Timeline.Window#isDynamic
*/
boolean isCurrentWindowDynamic();
/**
* Returns whether the current window is seekable, or {@code false} if the {@link Timeline} is
* empty.
*
* @see Timeline.Window#isSeekable
*/
boolean isCurrentWindowSeekable();
} }
...@@ -272,6 +272,22 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -272,6 +272,22 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
@Override @Override
public boolean isCurrentWindowDynamic() {
if (timeline.isEmpty()) {
return false;
}
return timeline.getWindow(getCurrentWindowIndex(), window).isDynamic;
}
@Override
public boolean isCurrentWindowSeekable() {
if (timeline.isEmpty()) {
return false;
}
return timeline.getWindow(getCurrentWindowIndex(), window).isSeekable;
}
@Override
public int getRendererCount() { public int getRendererCount() {
return renderers.length; return renderers.length;
} }
......
...@@ -546,63 +546,73 @@ public class SimpleExoPlayer implements ExoPlayer { ...@@ -546,63 +546,73 @@ public class SimpleExoPlayer implements ExoPlayer {
} }
@Override @Override
public int getCurrentPeriodIndex() { public int getRendererCount() {
return player.getCurrentPeriodIndex(); return player.getRendererCount();
} }
@Override @Override
public int getCurrentWindowIndex() { public int getRendererType(int index) {
return player.getCurrentWindowIndex(); return player.getRendererType(index);
} }
@Override @Override
public long getDuration() { public TrackGroupArray getCurrentTrackGroups() {
return player.getDuration(); return player.getCurrentTrackGroups();
} }
@Override @Override
public long getCurrentPosition() { public TrackSelectionArray getCurrentTrackSelections() {
return player.getCurrentPosition(); return player.getCurrentTrackSelections();
} }
@Override @Override
public long getBufferedPosition() { public Timeline getCurrentTimeline() {
return player.getBufferedPosition(); return player.getCurrentTimeline();
} }
@Override @Override
public int getBufferedPercentage() { public Object getCurrentManifest() {
return player.getBufferedPercentage(); return player.getCurrentManifest();
} }
@Override @Override
public int getRendererCount() { public int getCurrentPeriodIndex() {
return player.getRendererCount(); return player.getCurrentPeriodIndex();
} }
@Override @Override
public int getRendererType(int index) { public int getCurrentWindowIndex() {
return player.getRendererType(index); return player.getCurrentWindowIndex();
} }
@Override @Override
public TrackGroupArray getCurrentTrackGroups() { public long getDuration() {
return player.getCurrentTrackGroups(); return player.getDuration();
} }
@Override @Override
public TrackSelectionArray getCurrentTrackSelections() { public long getCurrentPosition() {
return player.getCurrentTrackSelections(); return player.getCurrentPosition();
} }
@Override @Override
public Timeline getCurrentTimeline() { public long getBufferedPosition() {
return player.getCurrentTimeline(); return player.getBufferedPosition();
} }
@Override @Override
public Object getCurrentManifest() { public int getBufferedPercentage() {
return player.getCurrentManifest(); return player.getBufferedPercentage();
}
@Override
public boolean isCurrentWindowDynamic() {
return player.isCurrentWindowDynamic();
}
@Override
public boolean isCurrentWindowSeekable() {
return player.isCurrentWindowSeekable();
} }
// Renderer building. // Renderer building.
......
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