sjs/SJSAssetExportSession
1
0
Fork 0
mirror of https://github.com/samsonjs/SJSAssetExportSession.git synced 2026-03-25 08:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a crash when cancelled while writing samples

Browse source 
Now we never force-unwrap videoInput or videoOutput. Or anything else
for that matter.
This commit is contained in:
Sami Samhuri 2025-04-04 10:26:09 -07:00
parent 2f1b859a03
commit 1e768033a1
No known key found for this signature in database
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Sources/SJSAssetExportSession/SampleWriter.swift
View file

@ -229,7 +229,7 @@ actor SampleWriter {
} }
private func startEncodingVideoTracks() { private func startEncodingVideoTracks() {
videoInput!.requestMediaDataWhenReady(on: queue) { videoInput?.requestMediaDataWhenReady(on: queue) {
// NOTE: assumeIsolated crashes on macOS with Swift 6.0, fixed in 6.1 // NOTE: assumeIsolated crashes on macOS with Swift 6.0, fixed in 6.1
self.assumeIsolated { _self in self.assumeIsolated { _self in
_self.writeAllReadySamples() _self.writeAllReadySamples()
@ -243,8 +243,10 @@ actor SampleWriter {
if !hasMoreAudio { log.debug("Finished encoding audio") } if !hasMoreAudio { log.debug("Finished encoding audio") }
} }
let hasMoreVideo = writeReadySamples(output: videoOutput!, input: videoInput!) if let videoInput, let videoOutput {
if !hasMoreVideo { log.debug("Finished encoding video") } let hasMoreVideo = writeReadySamples(output: videoOutput, input: videoInput)
if !hasMoreVideo { log.debug("Finished encoding video") }
}
} }
private func writeReadySamples(output: AVAssetReaderOutput, input: AVAssetWriterInput) -> Bool { private func writeReadySamples(output: AVAssetReaderOutput, input: AVAssetWriterInput) -> Bool {