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

Only update track streams in updateTrackStreams.

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

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

@ -790,8 +790,9 @@ import java.util.ArrayList;
}
int enabledRendererCount = disableRenderers(false, newTrackSelections);
TrackStream[] newStreams = playingSource.updateTrackStreams(oldStreams, newTrackSelections,
newSelections, playbackInfo.positionUs);
TrackStream[] newStreams = sampleSource.selectTracks(oldStreams, newSelections,
playbackInfo.positionUs);
playingSource.updateTrackStreams(newTrackSelections, newSelections, newStreams);
trackSelector.onSelectionActivated(trackSelectionData);
// Update the stored TrackStreams.
@ -989,14 +990,12 @@ import java.util.ArrayList;
}
}
}
updateTrackStreams(oldStreams, newTrackSelections, newSelections, positionUs);
TrackStream[] newStreams = sampleSource.selectTracks(oldStreams, newSelections, positionUs);
updateTrackStreams(newTrackSelections, newSelections, newStreams);
}
public TrackStream[] updateTrackStreams(ArrayList<TrackStream> oldStreams,
TrackSelectionArray newTrackSelections, ArrayList<TrackSelection> newSelections,
long positionUs) {
TrackStream[] newStreams = sampleSource.selectTracks(oldStreams, newSelections,
positionUs);
public void updateTrackStreams(TrackSelectionArray newTrackSelections,
ArrayList<TrackSelection> newSelections, TrackStream[] newStreams) {
hasEnabledTracks = false;
for (int i = 0; i < newTrackSelections.length; i++) {
TrackSelection selection = newTrackSelections.get(i);
@ -1013,7 +1012,6 @@ import java.util.ArrayList;
}
}
trackSelections = newTrackSelections;
return newStreams;
}
public void release() {