Commit b787852e by Oliver Woodman

Correctly stop previous renderers if prepare is called again.

parent 88daaa88
...@@ -247,7 +247,7 @@ import java.util.List; ...@@ -247,7 +247,7 @@ import java.util.List;
} }
private void prepareInternal(TrackRenderer[] renderers) { private void prepareInternal(TrackRenderer[] renderers) {
rebuffering = false; resetInternal();
this.renderers = renderers; this.renderers = renderers;
for (int i = 0; i < renderers.length; i++) { for (int i = 0; i < renderers.length; i++) {
if (renderers[i].isTimeSource()) { if (renderers[i].isTimeSource()) {
...@@ -475,12 +475,13 @@ import java.util.List; ...@@ -475,12 +475,13 @@ import java.util.List;
} }
private void stopInternal() { private void stopInternal() {
rebuffering = false;
resetInternal(); resetInternal();
setState(ExoPlayer.STATE_IDLE);
} }
private void releaseInternal() { private void releaseInternal() {
resetInternal(); resetInternal();
setState(ExoPlayer.STATE_IDLE);
synchronized (this) { synchronized (this) {
released = true; released = true;
notifyAll(); notifyAll();
...@@ -490,6 +491,7 @@ import java.util.List; ...@@ -490,6 +491,7 @@ import java.util.List;
private void resetInternal() { private void resetInternal() {
handler.removeMessages(MSG_DO_SOME_WORK); handler.removeMessages(MSG_DO_SOME_WORK);
handler.removeMessages(MSG_INCREMENTAL_PREPARE); handler.removeMessages(MSG_INCREMENTAL_PREPARE);
rebuffering = false;
mediaClock.stop(); mediaClock.stop();
if (renderers == null) { if (renderers == null) {
return; return;
...@@ -502,7 +504,6 @@ import java.util.List; ...@@ -502,7 +504,6 @@ import java.util.List;
renderers = null; renderers = null;
timeSourceTrackRenderer = null; timeSourceTrackRenderer = null;
enabledRenderers.clear(); enabledRenderers.clear();
setState(ExoPlayer.STATE_IDLE);
} }
private void stopAndDisable(TrackRenderer renderer) { private void stopAndDisable(TrackRenderer renderer) {
......
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