Skip to content

fix(android): report track selection in onTextTracks/onAudioTracks with controls #4920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janpe wants to merge 1 commit into
base: support/6.x.x
Choose a base branch
from
+17 −12
Open

fix(android): report track selection in onTextTracks/onAudioTracks with controls #4920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,24 +1739,26 @@ private ArrayList<Track> getBasicAudioTrackInfo() {
}

TrackGroupArray groups = info.getTrackGroups(index);

TrackSelectionArray selectionArray = player.getCurrentTrackSelections();
TrackSelection selection = selectionArray.get(C.TRACK_TYPE_AUDIO);

for (int groupIndex = 0; groupIndex < groups.length; ++groupIndex) {
TrackGroup group = groups.get(groupIndex);
Format format = group.getFormat(0);

// Create track without trying to determine selection status

Track track = new Track();
track.setIndex(groupIndex);
track.setLanguage(format.language != null ? format.language : "unknown");
track.setTitle(format.label != null ? format.label : "Track " + (groupIndex + 1));
track.setSelected(false); // Don't report selection status - let PlayerView handle it
// Report the actual selection state so JS stays in sync with the native picker
track.setSelected(selection != null && selection.getTrackGroup() == group);
if (format.sampleMimeType != null) track.setMimeType(format.sampleMimeType);
track.setBitrate(format.bitrate == Format.NO_VALUE ? 0 : format.bitrate);

tracks.add(track);
}
DebugLog.d(TAG, "getBasicAudioTrackInfo: returning " + tracks.size() + " audio tracks (no selection status)");

DebugLog.d(TAG, "getBasicAudioTrackInfo: returning " + tracks.size() + " audio tracks");
return tracks;
}

Expand All @@ -1773,28 +1775,31 @@ private ArrayList<Track> getBasicTextTrackInfo() {
}

TrackGroupArray groups = info.getTrackGroups(index);
TrackSelectionArray selectionArray = player.getCurrentTrackSelections();
TrackSelection selection = selectionArray.get(C.TRACK_TYPE_TEXT);

for (int groupIndex = 0; groupIndex < groups.length; ++groupIndex) {
TrackGroup group = groups.get(groupIndex);
for (int trackIndex = 0; trackIndex < group.length; trackIndex++) {
Format format = group.getFormat(trackIndex);

Track textTrack = new Track();
textTrack.setIndex(textTracks.size());
if (format.sampleMimeType != null) textTrack.setMimeType(format.sampleMimeType);
if (format.language != null) textTrack.setLanguage(format.language);

boolean isExternal = format.id != null && format.id.startsWith("external-subtitle-");

if (format.label != null && !format.label.isEmpty()) {
textTrack.setTitle(format.label);
} else if (isExternal) {
textTrack.setTitle("External " + (trackIndex + 1));
} else {
textTrack.setTitle("Track " + (textTracks.size() + 1));
}

textTrack.setSelected(false); // Don't report selection status - let PlayerView handle it

// Report the actual selection state so JS stays in sync with the native picker (#4918)
textTrack.setSelected(isTrackSelected(selection, group, trackIndex));
textTracks.add(textTrack);
}
}
Expand Down
Loading