Merge pull request #55 from amir-cg/master

Fix XCode 14 circular reference issue

Author: v-grigoriev

SCNRecorder.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'SCNRecorder'
-  s.version               = '2.8.0'
+  s.version               = '2.8.1'
   s.summary               = 'A lags-free recorder of ARKit and SceneKit for iOS in Swift'
   s.homepage              = 'https://github.com/gorastudio/SCNRecorder'
   s.license               = { :type => 'MIT', :file => 'LICENSE.md' }

Sources/MediaSession/MediaSession.swift

@@ -29,17 +29,14 @@ import UIKit
 
 final class MediaSession {
 
-  typealias Input = MediaSessionInput
 
-  typealias Output = MediaSessionOutput
+  enum VideoInput: VideoMediaSessionInput {
 
-  enum VideoInput: Input.Video {
+    case pixel(_ input: MediaSessionInput_PixelBufferVideo)
 
-    case pixel(_ input: Input.PixelBufferVideo)
+    case sample(_ input: MediaSessionInput_SampleBufferVideo)
 
-    case sample(_ input: Input.SampleBufferVideo)
-
-    var videoInput: Input.Video {
+    var videoInput: VideoMediaSessionInput {
       switch self {
       case .pixel(let input): return input
       case .sample(let input): return input
@@ -61,15 +58,15 @@ final class MediaSession {
 
   let queue: DispatchQueue
 
-  @UnfairAtomic var videoOutputs = [Output.Video]()
+  @UnfairAtomic var videoOutputs = [VideoMediaSessionOutput]()
 
-  @UnfairAtomic var audioOutputs = [Output.Audio]()
+  @UnfairAtomic var audioOutputs = [AudioMediaSessionOutput]()
 
   @Observable var error: Swift.Error?
 
   let videoInput: VideoInput
 
-  private(set) var audioInput: Input.SampleBufferAudio?
+  private(set) var audioInput: MediaSessionInput_SampleBufferAudio?
 
   init(
     queue: DispatchQueue,
@@ -81,7 +78,7 @@ final class MediaSession {
 
   convenience init(
     queue: DispatchQueue,
-    videoInput: Input.PixelBufferVideo
+    videoInput: MediaSessionInput_PixelBufferVideo
   ) {
     self.init(queue: queue, videoInput: .pixel(videoInput))
 
@@ -93,7 +90,7 @@ final class MediaSession {
 
   convenience init(
     queue: DispatchQueue,
-    videoInput: Input.SampleBufferVideo
+    videoInput: MediaSessionInput_SampleBufferVideo
   ) {
     self.init(queue: queue, videoInput: .sample(videoInput))
 
@@ -103,7 +100,7 @@ final class MediaSession {
     }
   }
 
-  func setAudioInput(_ audioInput: Input.SampleBufferAudio) {
+  func setAudioInput(_ audioInput: MediaSessionInput_SampleBufferAudio) {
     self.audioInput = audioInput
     audioInput.output = { [weak self] (sampleBuffer) in
       guard let self = self else { return }
@@ -206,28 +203,28 @@ extension MediaSession {
 
 extension MediaSession {
 
-  func addVideoOutput(_ videoOutput: MediaSession.Output.Video) {
+  func addVideoOutput(_ videoOutput: VideoMediaSessionOutput) {
     if ($videoOutputs.modify {
       $0.append(videoOutput)
       return $0.count == 1
     }) { videoInput.start() }
   }
 
-  func removeVideoOutput(_ videoOutput: MediaSession.Output.Video) {
+  func removeVideoOutput(_ videoOutput: VideoMediaSessionOutput) {
     if ($videoOutputs.modify {
       $0 = $0.filter { $0 !== videoOutput }
       return $0.count == 0
     }) { videoInput.stop() }
   }
 
-  func addAudioOutput(_ audioOutput: MediaSession.Output.Audio) {
+  func addAudioOutput(_ audioOutput: AudioMediaSessionOutput) {
     if ($audioOutputs.modify {
       $0.append(audioOutput)
       return $0.count == 1
     }) { audioInput?.start() }
   }
 
-  func removeAudioOutput(_ audioOutput: MediaSession.Output.Audio) {
+  func removeAudioOutput(_ audioOutput: AudioMediaSessionOutput) {
     if ($audioOutputs.modify {
       $0 = $0.filter { $0 !== audioOutput }
       return $0.count == 0

Sources/MediaSession/MediaSessionInput.swift

@@ -27,30 +27,29 @@ import Foundation
 import AVFoundation
 import UIKit
 
-protocol MediaSessionInput {
-
-  typealias Audio = AudioMediaSessionInput
 
-  typealias Video = VideoMediaSessionInput
+internal typealias MediaSessionInput_SampleBufferAudio = AudioMediaSessionInput & SampleBufferInput
+internal typealias MediaSessionInput_SampleBufferVideo = VideoMediaSessionInput & SampleBufferInput
+internal typealias MediaSessionInput_PixelBufferVideo = VideoMediaSessionInput & BufferInput
 
-  typealias SampleBufferAudio = AudioMediaSessionInput & SampleBufferInput
 
-  typealias SampleBufferVideo = VideoMediaSessionInput & SampleBufferInput
-
-  typealias PixelBufferVideo = VideoMediaSessionInput & BufferInput
+internal
+protocol MediaSessionInput {
 
   func start()
 
   func stop()
 }
 
+internal
 protocol AudioMediaSessionInput: MediaSessionInput {
 
   func recommendedAudioSettingsForAssetWriter(
     writingTo outputFileType: AVFileType
   ) -> [String: Any]
 }
 
+internal
 protocol VideoMediaSessionInput: MediaSessionInput {
 
   var size: CGSize { get }
@@ -62,11 +61,13 @@ protocol VideoMediaSessionInput: MediaSessionInput {
   var imageOrientation: UIImage.Orientation { get }
 }
 
+internal
 protocol SampleBufferInput: AnyObject {
 
   var output: ((CMSampleBuffer) -> Void)? { get set }
 }
 
+internal
 protocol BufferInput: AnyObject {
 
   var output: ((CVBuffer, CMTime) -> Void)? { get set }

Sources/MediaSession/MediaSessionOutput.swift

@@ -28,9 +28,6 @@ import AVFoundation
 
 protocol MediaSessionOutput: AnyObject {
 
-  typealias Audio = AudioMediaSessionOutput
-
-  typealias Video = VideoMediaSessionOutput
 }
 
 protocol AudioMediaSessionOutput: MediaSessionOutput {

Sources/Outputs/PixelBufferOutput.swift

@@ -27,8 +27,8 @@ import Foundation
 import AVFoundation
 
 final public class PixelBufferOutput {
-
-  final class Weak: MediaSession.Output.Video {
+    
+  final class Weak: VideoMediaSessionOutput {
 
     weak var output: PixelBufferOutput?
 
@@ -65,7 +65,7 @@ final public class PixelBufferOutput {
   }
 }
 
-extension PixelBufferOutput: MediaSession.Output.Video {
+extension PixelBufferOutput: VideoMediaSessionOutput {
 
   func appendVideoSampleBuffer(_ sampleBuffer: CMSampleBuffer) {
     guard let imageBuffer: CVImageBuffer = {

Sources/Outputs/VideoOutput/VideoOutput.swift

@@ -227,7 +227,7 @@ private extension VideoOutput {
 }
 
 // - MARK: VideoOutput
-extension VideoOutput: MediaSession.Output.Video {
+extension VideoOutput: VideoMediaSessionOutput {
 
   func appendVideoSampleBuffer(_ sampleBuffer: CMSampleBuffer) {
     state = state.appendVideoSampleBuffer(sampleBuffer, to: self)
@@ -239,7 +239,7 @@ extension VideoOutput: MediaSession.Output.Video {
 }
 
 // - MARK: AudioOutput
-extension VideoOutput: MediaSession.Output.Audio {
+extension VideoOutput: AudioMediaSessionOutput {
 
   func appendAudioSampleBuffer(_ sampleBuffer: CMSampleBuffer) {
     state = state.appendAudioSampleBuffer(sampleBuffer, to: self)

Sources/Recorder/BaseRecorder/BaseRecorder.AudioInput.swift

@@ -29,7 +29,7 @@ import ARKit
 
 extension BaseRecorder {
 
-  final class AudioInput: NSObject, MediaSession.Input.SampleBufferAudio {
+  final class AudioInput: NSObject, MediaSessionInput_SampleBufferAudio {
 
     let queue: DispatchQueue
 

Sources/Recorder/CleanRecorder/CleanRecorder.VideoInput.swift

@@ -29,7 +29,7 @@ import SceneKit
 
 extension CleanRecorder {
 
-  final class VideoInput<T: CleanRecordable>: MediaSession.Input.PixelBufferVideo, TimeScalable {
+  final class VideoInput<T: CleanRecordable>: MediaSessionInput_PixelBufferVideo, TimeScalable {
 
     weak var cleanRecordable: T?
 

Sources/Recorder/SceneRecorder/SceneRecorder.VideoInput.swift

@@ -29,7 +29,7 @@ import SceneKit
 
 extension SceneRecorder {
 
-  final class VideoInput: MediaSession.Input.PixelBufferVideo, TimeScalable {
+  final class VideoInput: MediaSessionInput_PixelBufferVideo, TimeScalable {
 
     enum Error: Swift.Error {