Merge pull request #1405 from shogo4405/feature/bump-to-up-os-versions

Supported OS version.
shogo4405 · Apr 6, 2024 · 11a0883 · 11a0883
2 parents faf54e4 + 0fc527d
commit 11a0883
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 182 deletions.
diff --git a/Examples/iOS/Preference.swift b/Examples/iOS/Preference.swift
@@ -1,6 +1,6 @@
 struct Preference {
     static var defaultInstance = Preference()
 
-    var uri: String? = "rtmp://192.168.1.4/live"
+    var uri: String? = "rtmp://192.168.1.10/live"
     var streamName: String? = "live"
 }
diff --git a/HaishinKit.xcodeproj/project.pbxproj b/HaishinKit.xcodeproj/project.pbxproj
diff --git a/Package.swift b/Package.swift
@@ -5,10 +5,10 @@ import PackageDescription
 let package = Package(
     name: "HaishinKit",
     platforms: [
-        .iOS(.v12),
-        .tvOS(.v12),
+        .iOS(.v13),
+        .tvOS(.v13),
         .visionOS(.v1),
-        .macOS(.v10_13),
+        .macOS(.v10_15),
         .macCatalyst(.v14)
     ],
     products: [

diff --git a/README.md b/README.md
@@ -136,8 +136,8 @@ open HaishinKit.xcodeproj
 ### OS
 |-|iOS|tvOS|macOS|visionOS|watchOS|
 |:----|:----:|:----:|:----:|:----:|:----:|
-|HaishinKit|12.0+|12.0+|10.13+|1.0+|-|
-|SRTHaishinKit|12.0+|-|13.0+|-|-|
+|HaishinKit|13.0+|13.0+|10.15+|1.0+|-|
+|SRTHaishinKit|13.0+|-|13.0+|-|-|
 
 ### Cocoa Keys
 Please contains Info.plist.

diff --git a/Sources/Codec/VideoCodec.swift b/Sources/Codec/VideoCodec.swift
@@ -160,7 +160,7 @@ final class VideoCodec<T: VideoCodecDelegate> {
             var attributes: [NSString: AnyObject] = [:]
             if let inputFormat {
                 // Specify the pixel format of the uncompressed video.
-                attributes[kCVPixelBufferPixelFormatTypeKey] = inputFormat._mediaSubType as CFNumber
+                attributes[kCVPixelBufferPixelFormatTypeKey] = inputFormat.mediaType.rawValue as CFNumber
             }
             return attributes.isEmpty ? nil : attributes
         case .decompression:

diff --git a/Sources/Extension/AVCaptureDevice.Format+Extension.swift b/Sources/Extension/AVCaptureDevice.Format+Extension.swift
@@ -1,14 +1,7 @@
 import AVFoundation
 import Foundation
 
-#if os(iOS)
-extension AVCaptureDevice.Format {
-    @available(iOS, obsoleted: 13.0)
-    var isMultiCamSupported: Bool {
-        return false
-    }
-}
-#elseif os(macOS)
+#if os(macOS)
 extension AVCaptureDevice.Format {
     var isMultiCamSupported: Bool {
         return true

diff --git a/Sources/Extension/AVCaptureSession.Preset+Extension.swift b/Sources/Extension/AVCaptureSession.Preset+Extension.swift
@@ -1,13 +1,6 @@
 import AVFoundation
 import Foundation
 
-#if os(macOS)
-extension AVCaptureSession.Preset {
-    @available(macOS, obsoleted: 10.15)
-    private static let hd1920x1080 = AVCaptureSession.Preset(rawValue: "")
-}
-#endif
-
 #if os(iOS) || os(tvOS) || os(macOS)
 @available(tvOS 17.0, *)
 extension AVCaptureSession.Preset {

diff --git a/Sources/Extension/CMBlockBuffer+Extension.swift b/Sources/Extension/CMBlockBuffer+Extension.swift
@@ -1,13 +1,6 @@
 import CoreMedia
 
 extension CMBlockBuffer {
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var dataLength: Int {
-        CMBlockBufferGetDataLength(self)
-    }
-
     var data: Data? {
         var length = 0
         var buffer: UnsafeMutablePointer<Int8>?

diff --git a/Sources/Extension/CMBufferQueue+Extension.swift b/Sources/Extension/CMBufferQueue+Extension.swift
diff --git a/Sources/Extension/CMFormatDescription+Extension.swift b/Sources/Extension/CMFormatDescription+Extension.swift
diff --git a/Sources/Extension/CMSampleBuffer+Extension.swift b/Sources/Extension/CMSampleBuffer+Extension.swift
@@ -14,69 +14,6 @@ extension CMSampleBuffer {
         }
     }
 
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var isValid: Bool {
-        CMSampleBufferIsValid(self)
-    }
-
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var dataBuffer: CMBlockBuffer? {
-        get {
-            CMSampleBufferGetDataBuffer(self)
-        }
-        set {
-            _ = newValue.map {
-                CMSampleBufferSetDataBuffer(self, newValue: $0)
-            }
-        }
-    }
-
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var imageBuffer: CVImageBuffer? {
-        CMSampleBufferGetImageBuffer(self)
-    }
-
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var numSamples: CMItemCount {
-        CMSampleBufferGetNumSamples(self)
-    }
-
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var duration: CMTime {
-        CMSampleBufferGetDuration(self)
-    }
-
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var formatDescription: CMFormatDescription? {
-        CMSampleBufferGetFormatDescription(self)
-    }
-
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var decodeTimeStamp: CMTime {
-        CMSampleBufferGetDecodeTimeStamp(self)
-    }
-
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var presentationTimeStamp: CMTime {
-        CMSampleBufferGetPresentationTimeStamp(self)
-    }
-
     func muted(_ muted: Bool) -> CMSampleBuffer {
         guard muted else {
             return self

diff --git a/Sources/Extension/CMVideoFormatDescription+Extension.swift b/Sources/Extension/CMVideoFormatDescription+Extension.swift
@@ -2,13 +2,6 @@ import CoreImage
 import CoreMedia
 
 extension CMVideoFormatDescription {
-    @available(iOS, obsoleted: 13.0)
-    @available(tvOS, obsoleted: 13.0)
-    @available(macOS, obsoleted: 10.15)
-    var dimensions: CMVideoDimensions {
-        CMVideoFormatDescriptionGetDimensions(self)
-    }
-
     var isCompressed: Bool {
         switch CMFormatDescriptionGetMediaSubType(self) {
         case kCVPixelFormatType_1Monochrome,

diff --git a/Sources/Extension/vImage_CGImageFormat+Extension.swift b/Sources/Extension/vImage_CGImageFormat+Extension.swift
diff --git a/Sources/IO/IOStream.swift b/Sources/IO/IOStream.swift
@@ -364,12 +364,12 @@ open class IOStream: NSObject {
     /// Append a CMSampleBuffer.
     /// - Warning: This method can't use attachCamera or attachAudio method at the same time.
     public func append(_ sampleBuffer: CMSampleBuffer, channel: UInt8 = 0) {
-        switch sampleBuffer.formatDescription?._mediaType {
-        case kCMMediaType_Audio:
+        switch sampleBuffer.formatDescription?.mediaType {
+        case .audio?:
             mixer.audioIO.lockQueue.async {
                 self.mixer.audioIO.append(sampleBuffer, channel: channel)
             }
-        case kCMMediaType_Video:
+        case .video?:
             mixer.videoIO.lockQueue.async {
                 self.mixer.videoIO.append(sampleBuffer, channel: channel)
             }

diff --git a/Sources/IO/IOStreamRecorder.swift b/Sources/IO/IOStreamRecorder.swift
@@ -76,7 +76,7 @@ public final class IOStreamRecorder {
         guard isRunning.value else {
             return
         }
-        let mediaType: AVMediaType = (sampleBuffer.formatDescription?._mediaType == kCMMediaType_Video) ? .video : .audio
+        let mediaType: AVMediaType = (sampleBuffer.formatDescription?.mediaType == .video) ? .video : .audio
         lockQueue.async {
             guard
                 let writer = self.writer,

diff --git a/Tests/Media/IORecorderTests.swift b/Tests/Media/IORecorderTests.swift
@@ -5,7 +5,7 @@ import AVFoundation
 
 @testable import HaishinKit
 
-final class IORecorderTests: XCTestCase, IORecorderDelegate {
+final class IORecorderTests: XCTestCase, IOStreamRecorderDelegate {
     func testRecorder2channel() {
         let recorder = IOStreamRecorder()
         recorder.delegate = self