Skip to content

SDK / exoplayer

Go to a project
Commit b7299a11 by aquilescanta Committed by Oliver Woodman
Options

DefaultTrackSelector: make audio track selections before text 

PiperOrigin-RevId: 239594105
parent a989304a
Inline Side-by-side
Showing with 12 additions and 8 deletions
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
...@@ -1485,15 +1485,8 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1485,15 +1485,8 @@ public class DefaultTrackSelector extends MappingTrackSelector {
AudioTrackScore selectedAudioTrackScore = null; AudioTrackScore selectedAudioTrackScore = null;
int selectedAudioRendererIndex = C.INDEX_UNSET; int selectedAudioRendererIndex = C.INDEX_UNSET;
int selectedTextTrackScore = Integer.MIN_VALUE;
int selectedTextRendererIndex = C.INDEX_UNSET;
for (int i = 0; i < rendererCount; i++) { for (int i = 0; i < rendererCount; i++) {
int trackType = mappedTrackInfo.getRendererType(i); if (C.TRACK_TYPE_AUDIO == mappedTrackInfo.getRendererType(i)) {
switch (trackType) {
case C.TRACK_TYPE_VIDEO:
// Already done. Do nothing.
break;
case C.TRACK_TYPE_AUDIO:
Pair<TrackSelection.Definition, AudioTrackScore> audioSelection = Pair<TrackSelection.Definition, AudioTrackScore> audioSelection =
selectAudioTrack( selectAudioTrack(
mappedTrackInfo.getTrackGroups(i), mappedTrackInfo.getTrackGroups(i),
...@@ -1513,6 +1506,17 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -1513,6 +1506,17 @@ public class DefaultTrackSelector extends MappingTrackSelector {
selectedAudioTrackScore = audioSelection.second; selectedAudioTrackScore = audioSelection.second;
selectedAudioRendererIndex = i; selectedAudioRendererIndex = i;
} }
}
}
int selectedTextTrackScore = Integer.MIN_VALUE;
int selectedTextRendererIndex = C.INDEX_UNSET;
for (int i = 0; i < rendererCount; i++) {
int trackType = mappedTrackInfo.getRendererType(i);
switch (trackType) {
case C.TRACK_TYPE_VIDEO:
case C.TRACK_TYPE_AUDIO:
// Already done. Do nothing.
break; break;
case C.TRACK_TYPE_TEXT: case C.TRACK_TYPE_TEXT:
Pair<TrackSelection.Definition, Integer> textSelection = Pair<TrackSelection.Definition, Integer> textSelection =
......
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