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

Fix release builds by using makeStream for SampleWriter's progress

Browse source
This commit is contained in:
Sami Samhuri 2024-10-19 12:36:04 -07:00
parent 7edb4b7f46
commit 6f6a5f00e0
No known key found for this signature in database
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Sources/SJSAssetExportSession/ExportSession.swift
View file

@ -67,7 +67,7 @@ public final class ExportSession: Sendable {
fileType: fileType fileType: fileType
) )
Task { [progressContinuation] in Task { [progressContinuation] in
for await progress in await sampleWriter.progressStream { for await progress in sampleWriter.progressStream {
progressContinuation.yield(progress) progressContinuation.yield(progress)
} }
} }
@ -149,7 +149,7 @@ public final class ExportSession: Sendable {
fileType: fileType fileType: fileType
) )
Task { [progressContinuation] in Task { [progressContinuation] in
for await progress in await sampleWriter.progressStream { for await progress in sampleWriter.progressStream {
progressContinuation.yield(progress) progressContinuation.yield(progress)
} }
} }

19
Sources/SJSAssetExportSession/SampleWriter.swift
View file

@ -27,10 +27,9 @@ actor SampleWriter {
queue.asUnownedSerialExecutor() queue.asUnownedSerialExecutor()
} }
lazy var progressStream: AsyncStream<Float> = AsyncStream { continuation in let progressStream: AsyncStream<Float>
progressContinuation = continuation
} private let progressContinuation: AsyncStream<Float>.Continuation
private var progressContinuation: AsyncStream<Float>.Continuation?
// MARK: Inputs // MARK: Inputs
@ -65,6 +64,8 @@ actor SampleWriter {
) async throws { ) async throws {
precondition(!videoOutputSettings.isEmpty) precondition(!videoOutputSettings.isEmpty)
(progressStream, progressContinuation) = AsyncStream<Float>.makeStream()
let duration = if let timeRange { let duration = if let timeRange {
timeRange.duration timeRange.duration
} else { } else {
@ -111,7 +112,7 @@ actor SampleWriter {
func writeSamples() async throws { func writeSamples() async throws {
try Task.checkCancellation() try Task.checkCancellation()
progressContinuation?.yield(0.0) progressContinuation.yield(0.0)
writer.startWriting() writer.startWriting()
writer.startSession(atSourceTime: timeRange.start) writer.startSession(atSourceTime: timeRange.start)
@ -142,14 +143,14 @@ actor SampleWriter {
} }
} }
progressContinuation?.yield(1.0) progressContinuation.yield(1.0)
// Make sure the last progress value is yielded before returning. // Make sure the last progress value is yielded before returning.
await withCheckedContinuation { continuation in await withCheckedContinuation { continuation in
progressContinuation?.onTermination = { _ in progressContinuation.onTermination = { _ in
continuation.resume(returning: ()) continuation.resume(returning: ())
} }
progressContinuation?.finish() progressContinuation.finish()
} }
} }
@ -288,7 +289,7 @@ actor SampleWriter {
if output == videoOutput { if output == videoOutput {
let samplePresentationTime = CMSampleBufferGetPresentationTimeStamp(sampleBuffer) - timeRange.start let samplePresentationTime = CMSampleBufferGetPresentationTimeStamp(sampleBuffer) - timeRange.start
let progress = Float(samplePresentationTime.seconds / duration.seconds) let progress = Float(samplePresentationTime.seconds / duration.seconds)
progressContinuation?.yield(progress) progressContinuation.yield(progress)
} }
guard input.append(sampleBuffer) else { guard input.append(sampleBuffer) else {