fix(ios): add text tracks only if we successfully insertTimeRage (The…

…WidlarzGroup#3557) 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 TheWidlarzGroup#3480
gkueny · Mar 4, 2024 · b73baad · b73baad
1 parent c0aa3d6
commit b73baad
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/ios/Video/Features/RCTVideoUtils.swift b/ios/Video/Features/RCTVideoUtils.swift
@@ -299,23 +299,32 @@ enum RCTVideoUtils {
                     if let textTracks {
                         for i in 0 ..< tracks.count {
                             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,
                                                                                                            preferredTrackID: kCMPersistentTrackID_Invalid)
-                            try? textCompTrack.insertTimeRange(
-                                CMTimeRangeMake(start: .zero, duration: videoAsset.timeRange.duration),
-                                of: track,
-                                at: .zero
-                            )
+
+                            do {
+                                try textCompTrack.insertTimeRange(
+                                    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
                 }.then {
-                    let emptyVttFile: TextTrack? = self.createEmptyVttFile()
-                    if emptyVttFile != nil {
-                        validTextTracks.append(emptyVttFile!)
+                    if !validTextTracks.isEmpty {
+                        let emptyVttFile: TextTrack? = self.createEmptyVttFile()
+                        if emptyVttFile != nil {
+                            validTextTracks.append(emptyVttFile!)
+                        }
                     }
 
                     fulfill(validTextTracks)