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 tests with Swift 6.1 on macOS, which finally works!

Browse source
This commit is contained in:
Sami Samhuri 2025-02-23 09:20:15 -08:00
parent 49d41080bb
commit 62a7a375c0
No known key found for this signature in database
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Sources/SJSAssetExportSession/SampleWriter.swift
View file

@ -221,7 +221,7 @@ actor SampleWriter {
} }
audioInput.requestMediaDataWhenReady(on: queue) { audioInput.requestMediaDataWhenReady(on: queue) {
// NOTE: assumeIsolated crashes on macOS at the moment // 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()
} }
@ -230,7 +230,7 @@ actor SampleWriter {
private func startEncodingVideoTracks() { private func startEncodingVideoTracks() {
videoInput!.requestMediaDataWhenReady(on: queue) { videoInput!.requestMediaDataWhenReady(on: queue) {
// NOTE: assumeIsolated crashes on macOS at the moment // 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()
} }

4
Tests/SJSAssetExportSessionTests/SJSAssetExportSessionTests.swift
View file

@ -43,7 +43,7 @@ final class ExportSessionTests: BaseTests {
#expect(try await videoTrack.load(.naturalSize) == CGSize(width: 1280, height: 720)) #expect(try await videoTrack.load(.naturalSize) == CGSize(width: 1280, height: 720))
#expect(try await videoTrack.load(.nominalFrameRate) == 24.0) #expect(try await videoTrack.load(.nominalFrameRate) == 24.0)
let dataRate = try await videoTrack.load(.estimatedDataRate) let dataRate = try await videoTrack.load(.estimatedDataRate)
#expect((1_000_000 ... 1_100_000).contains(dataRate)) #expect((900_000 ... 1_100_000).contains(dataRate))
let videoFormat = try #require(await videoTrack.load(.formatDescriptions).first) let videoFormat = try #require(await videoTrack.load(.formatDescriptions).first)
#expect(videoFormat.mediaType == .video) #expect(videoFormat.mediaType == .video)
#expect(videoFormat.mediaSubType == .h264) #expect(videoFormat.mediaSubType == .h264)
@ -92,7 +92,7 @@ final class ExportSessionTests: BaseTests {
#expect(try await videoTrack.load(.naturalSize) == CGSize(width: 1280, height: 720)) #expect(try await videoTrack.load(.naturalSize) == CGSize(width: 1280, height: 720))
#expect(try await videoTrack.load(.nominalFrameRate) == 24.0) #expect(try await videoTrack.load(.nominalFrameRate) == 24.0)
let dataRate = try await videoTrack.load(.estimatedDataRate) let dataRate = try await videoTrack.load(.estimatedDataRate)
#expect((1_000_000 ... 1_100_000).contains(dataRate)) #expect((900_000 ... 1_100_000).contains(dataRate))
let videoFormat = try #require(await videoTrack.load(.formatDescriptions).first) let videoFormat = try #require(await videoTrack.load(.formatDescriptions).first)
#expect(videoFormat.mediaType == .video) #expect(videoFormat.mediaType == .video)
#expect(videoFormat.mediaSubType == .h264) #expect(videoFormat.mediaSubType == .h264)