sjs/SJSAssetExportSession
1
0
Fork 0
mirror of https://github.com/samsonjs/SJSAssetExportSession.git synced 2026-04-27 14:57:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to improve cancellation response, memory might be leaking

Browse source
This commit is contained in:
Sami Samhuri 2025-01-19 14:05:46 -08:00
parent c5b127c702
commit 33152e4e44
No known key found for this signature in database
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Sources/SJSAssetExportSession/SampleWriter.swift
View file

@ -129,7 +129,10 @@ actor SampleWriter {
try await Task.sleep(for: .milliseconds(10)) try await Task.sleep(for: .milliseconds(10))
} }
guard reader.status != .cancelled && writer.status != .cancelled else { guard !isCancelled, reader.status != .cancelled, writer.status != .cancelled else {
log.debug("Cancelled before writing samples")
reader.cancelReading()
writer.cancelWriting()
throw CancellationError() throw CancellationError()
} }
guard writer.status != .failed else { guard writer.status != .failed else {
@ -253,6 +256,12 @@ actor SampleWriter {
private func writeReadySamples(output: AVAssetReaderOutput, input: AVAssetWriterInput) -> Bool { private func writeReadySamples(output: AVAssetReaderOutput, input: AVAssetWriterInput) -> Bool {
while input.isReadyForMoreMediaData { while input.isReadyForMoreMediaData {
guard !isCancelled else {
log.debug("Cancelled while writing samples")
reader.cancelReading()
writer.cancelWriting()
return false
}
guard reader.status == .reading && writer.status == .writing, guard reader.status == .reading && writer.status == .writing,
let sampleBuffer = output.copyNextSampleBuffer() else { let sampleBuffer = output.copyNextSampleBuffer() else {
input.markAsFinished() input.markAsFinished()