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.

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

Jump to bottom

Fix: Can't disable subtitle on iOS when using type: disabled #1468

Closed
wants to merge 2 commits into from
Closed

Fix: Can't disable subtitle on iOS when using type: disabled #1468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69a2a0c
Fix: Can't disable subtitle on iOS when using type: disabled
nbennink Feb 6, 2019
d8df6fe
Fix: Hide the empty subtitle file in the results of onLoad
nbennink Mar 15, 2019
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
44 changes: 40 additions & 4 deletions ios/Video/RCTVideo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ @implementation RCTVideo
BOOL _paused;
BOOL _repeat;
BOOL _allowsExternalPlayback;
NSArray * _textTracks;
NSMutableArray * _textTracks;
NSDictionary * _selectedTextTrack;
NSDictionary * _selectedAudioTrack;
BOOL _playbackStalled;
Expand Down Expand Up @@ -433,6 +433,29 @@ - (void)playerItemPrepareText:(AVAsset *)asset assetOptions:(NSDictionary * __nu
error:nil];

NSMutableArray* validTextTracks = [NSMutableArray array];


/**
* Load an useless / almost empty VTT file in the list with available tracks. This track gets selected when you give type: "disabled" as the selectedTextTrack
* This is needed because the player doesn't disable the texttrack otherwise. Now it does because it load a VTT file without content.
* More on this issue here: https://github.com/react-native-community/react-native-video/issues/1144
*/
NSError *error;
NSString *filePath = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject] stringByAppendingPathComponent:@"empty.vtt"];
if (![[NSFileManager defaultManager] isReadableFileAtPath:filePath]){
NSString *stringToWrite = @"WEBVTT\n\n1\n98:00:00.100 --> 98:00:00.200\n.\n\n2\n99:00:00.000 --> 99:00:00.100\n..";
[stringToWrite writeToFile:filePath atomically:YES encoding:NSUTF8StringEncoding error:&error];
}
if (error == nil){
NSMutableDictionary *emptyVTTDictionary = [[NSMutableDictionary alloc] init];
emptyVTTDictionary[@"language"] = @"disabled";
emptyVTTDictionary[@"label"] = @"NameIsRequiredButItDoesntMatterBecauseThisIsTheEmptyVttFile";
emptyVTTDictionary[@"uri"] = filePath;
emptyVTTDictionary[@"type"] = @"text/vtt";

[_textTracks addObject:emptyVTTDictionary];
}

for (int i = 0; i < _textTracks.count; ++i) {
AVURLAsset *textURLAsset;
NSString *textUri = [_textTracks objectAtIndex:i][@"uri"];
Expand Down Expand Up @@ -618,6 +641,13 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
}
}

NSMutableArray *availableTextTracks = [[NSMutableArray alloc] initWithArray:[self getTextTrackInfo]];

// Remove the empty subtitle file from the results (since it should be selected using {type: "disabled"})
if (availableTextTracks.count > 0 && [[availableTextTracks objectAtIndex:availableTextTracks.count - 1][@"language"] isEqual: @"disabled"]) {
[availableTextTracks removeObjectAtIndex:availableTextTracks.count - 1];
}

if (self.onVideoLoad && _videoLoadStarted) {
self.onVideoLoad(@{@"duration": [NSNumber numberWithFloat:duration],
@"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(_playerItem.currentTime)],
Expand All @@ -633,7 +663,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
@"orientation": orientation
},
@"audioTracks": [self getAudioTrackInfo],
@"textTracks": [self getTextTrackInfo],
@"textTracks": availableTextTracks,
@"target": self.reactTag});
}
_videoLoadStarted = NO;
Expand Down Expand Up @@ -984,9 +1014,10 @@ - (void) setSideloadedText {
}

int selectedTrackIndex = RCTVideoUnset;

bool isDisabled = NO;

if ([type isEqualToString:@"disabled"]) {
// Do nothing. We want to ensure option is nil
isDisabled = YES;
} else if ([type isEqualToString:@"language"]) {
NSString *selectedValue = _selectedTextTrack[@"value"];
for (int i = 0; i < textTracks.count; ++i) {
Expand Down Expand Up @@ -1038,6 +1069,11 @@ - (void) setSideloadedText {
}
[_player.currentItem.tracks[i] setEnabled:isEnabled];
}

// Make sure that the empty VTT track is enabled when it received: type = disabled
if (isDisabled) {
[_player.currentItem.tracks[_player.currentItem.tracks.count - 1] setEnabled:YES];
}
}

-(void) setStreamingText {
Expand Down