Improve audio passthrough

finnvoor · finnvoor · commit f8fd5fb3ca6a · 2024-02-03T16:45:21.000Z
diff --git a/Sources/Upscaling/UpscalingCompositor.swift b/Sources/Upscaling/UpscalingCompositor.swift
@@ -34,6 +34,10 @@ public final class UpscalingCompositor: NSObject, AVVideoCompositing {
             asyncVideoCompositionRequest.finish(with: Error.couldNotGetSourceFrame)
             return
         }
+        guard inputSize != outputSize else {
+            asyncVideoCompositionRequest.finish(withComposedVideoFrame: sourceFrame)
+            return
+        }
         #if canImport(MetalFX)
         guard let destinationFrame = asyncVideoCompositionRequest.renderContext.newPixelBuffer() else {
             asyncVideoCompositionRequest.finish(with: Error.couldNotCreateDestinationPixelBuffer)
diff --git a/Sources/Upscaling/UpscalingExportSession.swift b/Sources/Upscaling/UpscalingExportSession.swift
@@ -133,7 +133,7 @@ public class UpscalingExportSession {
                     throw Error.couldNotAddAssetWriterVideoInput
                 }
             case .audio:
-                let audioOutput = AVAssetReaderAudioMixOutput(audioTracks: [track], audioSettings: nil)
+                let audioOutput = AVAssetReaderTrackOutput(track: track, outputSettings: nil)
                 audioOutput.alwaysCopiesSampleData = false
                 if assetReader.canAdd(audioOutput) {
                     assetReader.add(audioOutput)

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public class UpscalingExportSession {`
`133`	`133`	`throw Error.couldNotAddAssetWriterVideoInput`
`134`	`134`	`}`
`135`	`135`	`case .audio:`
`136`		`- let audioOutput = AVAssetReaderAudioMixOutput(audioTracks: [track], audioSettings: nil)`
	`136`	`+ let audioOutput = AVAssetReaderTrackOutput(track: track, outputSettings: nil)`
`137`	`137`	`audioOutput.alwaysCopiesSampleData = false`
`138`	`138`	`if assetReader.canAdd(audioOutput) {`
`139`	`139`	`assetReader.add(audioOutput)`