railbird/react-native-video
10
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(ios): add text tracks only if we successfully insertTimeRage (#3557)

Browse Source 
insertTimeRage can fail & if we add failed textTrack to our validTextTracks array, video can crash later on selectTextTrack
we also add en empty textTrack only we we have validTextTrack

related to https://github.com/react-native-video/react-native-video/issues/3480
This commit is contained in:
Gaëtan Kueny
2024-03-04 10:43:33 +01:00
committed by GitHub
parent c0aa3d6453
commit b73baad2c2
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ios/Video/Features/RCTVideoUtils.swift
View File

@@ -299,23 +299,32 @@ enum RCTVideoUtils {
if let textTracks { if let textTracks {
for i in 0 ..< tracks.count { for i in 0 ..< tracks.count {
guard let track = tracks[i]?.first else { continue } // fix when there's no textTrackAsset guard let track = tracks[i]?.first else { continue } // fix when there's no textTrackAsset
validTextTracks.append(textTracks[i])
let textCompTrack: AVMutableCompositionTrack! = mixComposition.addMutableTrack(withMediaType: AVMediaType.text, let textCompTrack: AVMutableCompositionTrack! = mixComposition.addMutableTrack(withMediaType: AVMediaType.text,
preferredTrackID: kCMPersistentTrackID_Invalid) preferredTrackID: kCMPersistentTrackID_Invalid)
try? textCompTrack.insertTimeRange(
CMTimeRangeMake(start: .zero, duration: videoAsset.timeRange.duration), do {
of: track, try textCompTrack.insertTimeRange(
at: .zero CMTimeRangeMake(start: .zero, duration: videoAsset.timeRange.duration),
) of: track,
at: .zero
)
validTextTracks.append(textTracks[i])
} catch {
// TODO: upgrade error by call some props callback to better inform user
print("Error occurred on textTrack insert attempt: \(error.localizedDescription)")
continue
}
} }
} }
return return
}.then { }.then {
let emptyVttFile: TextTrack? = self.createEmptyVttFile() if !validTextTracks.isEmpty {
if emptyVttFile != nil { let emptyVttFile: TextTrack? = self.createEmptyVttFile()
validTextTracks.append(emptyVttFile!) if emptyVttFile != nil {
validTextTracks.append(emptyVttFile!)
}
} }
fulfill(validTextTracks) fulfill(validTextTracks)