sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-26 09:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't return a TrackStream from TrackRenderer.disable.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=125659817
This commit is contained in:
andrewlewis 2016-06-23 03:06:05 -07:00 committed by Oliver Woodman
parent adc7ecec09
commit fc2cdef208
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java
View file

@ -878,9 +878,8 @@ import java.util.ArrayList;
rendererMediaClockSource = null;
}
ensureStopped(renderer);
// TODO[playlists]: Consider using TrackStreams from the timeline source instead of
// returning a TrackStream from TrackRenderer.disable.
oldStreams.add(renderer.disable());
renderer.disable();
oldStreams.add(playingSource.trackStreams[i]);
}
if (newSelection != null) {
newSelections.add(newSelection);

4
library/src/main/java/com/google/android/exoplayer/TrackRenderer.java
View file

@ -314,14 +314,12 @@ public abstract class TrackRenderer implements ExoPlayerComponent {
/**
* Disable the renderer.
*/
/* package */ final TrackStream disable() {
/* package */ final void disable() {
Assertions.checkState(state == STATE_ENABLED);
state = STATE_DISABLED;
onDisabled();
TrackStream trackStream = stream;
stream = null;
streamIsFinal = false;
return trackStream;
}
/**