Skip to content
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.

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

Fix/text track selection by index ios #3728

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 23 additions & 9 deletions examples/basic/src/VideoPlayer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ class VideoPlayer extends Component {

seekerWidth = 0;

// internal usage change to index if you want to select tracks by index instead of lang
textTracksSelectionBy = 'lang';

srcAllPlatformList = [
{
description: 'local file landscape',
Expand Down Expand Up @@ -300,7 +303,10 @@ class VideoPlayer extends Component {
if (selectedTrack?.language) {
this.setState({
textTracks: data.textTracks,
selectedTextTrack: {
selectedTextTrack: this.textTracksSelectionBy === 'index' ? {
type: 'index',
value: selectedTrack?.index,
}: {
type: 'language',
value: selectedTrack?.language,
},
Expand Down Expand Up @@ -804,7 +810,7 @@ class VideoPlayer extends Component {
console.log('on value change ' + itemValue);
this.setState({
selectedTextTrack: {
type: 'language',
type: this.textTracksSelectionBy === 'index' ? 'index': 'language',
value: itemValue,
},
});
Expand All @@ -814,13 +820,21 @@ class VideoPlayer extends Component {
if (!track) {
return;
}
return (
<Picker.Item
label={track.language}
value={track.language}
key={track.language}
/>
);
if (this.textTracksSelectionBy === 'index') {
return (
<Picker.Item
label={`${track.index}`}
value={track.index}
key={track.index}
/>);
} else {
return (
<Picker.Item
label={track.language}
value={track.language}
key={track.language}
/>);
}
})}
</Picker>
)}
Expand Down
4 changes: 2 additions & 2 deletions ios/Video/DataStructures/SelectedTrackCriteria.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
struct SelectedTrackCriteria {
let type: String
let value: Any?
let value: String?

let json: NSDictionary?

Expand All @@ -13,6 +13,6 @@ struct SelectedTrackCriteria {
}
self.json = json
self.type = json["type"] as? String ?? ""
self.value = json["value"]
self.value = json["value"] as? String
}
}
16 changes: 10 additions & 6 deletions ios/Video/Features/RCTPlayerOperations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ enum RCTPlayerOperations {
}
}
} else if type == "index" {
if let value = criteria?.value, let index = value as? Int {
if textTracks.count > index {
selectedTrackIndex = index
if let value = criteria?.value { // check value is provided
if let indexValue = Int(value as String) { // ensure value is an integer an String to Snt
if textTracks.count > indexValue { // ensure value is in group range
selectedTrackIndex = indexValue
}
}
}
}
Expand Down Expand Up @@ -106,9 +108,11 @@ enum RCTPlayerOperations {
// } else if ([type isEqualToString:@"default"]) {
// option = group.defaultOption; */
} else if type == "index" {
if let value = criteria?.value, let index = value as? Int {
if group.options.count > index {
mediaOption = group.options[index]
if let value = criteria?.value { // check value is provided
if let indexValue = Int(value as String) { // ensure value is an integer an String to Snt
if group.options.count > indexValue { // ensure value is in group range
mediaOption = group.options[indexValue]
}
}
}
} else { // default. invalid type or "system"
Expand Down
Loading