Fix audio bug ios 26

Cabbage/Sources/Core/Audio/AudioProcessingTapHolder.swift

@@ -23,13 +23,13 @@ public class AudioProcessingTapHolder: NSObject, NSCopying {
             prepare: tapPrepare,
             unprepare: tapUnprepare,
             process: tapProcess)
-        var tap: Unmanaged<MTAudioProcessingTap>?
+        // Use the expected type for the Create function: MTAudioProcessingTap?
+        var tap: MTAudioProcessingTap?
         let err = MTAudioProcessingTapCreate(kCFAllocatorDefault, &callbacks, kMTAudioProcessingTapCreationFlag_PostEffects, &tap)
         if err != noErr {
             Log.error("error: failed to create audioProcessingTap")
         }
-        self.tap = tap?.takeRetainedValue()
-
+        self.tap = tap
     }
 
     // MARK: - Handler

Cabbage/Sources/Core/CompositionGenerator.swift

@@ -47,10 +47,10 @@ public class CompositionGenerator {
         return imageGenerator
     }
 
-    public func buildExportSession(presetName: String) -> AVAssetExportSession? {
+    public func buildExportSession(presetName: String, animationTool: AVVideoCompositionCoreAnimationTool? = nil) -> AVAssetExportSession? {
         let composition = buildComposition()
         let exportSession = AVAssetExportSession.init(asset: composition, presetName: presetName)
-        exportSession?.videoComposition = buildVideoComposition()
+        exportSession?.videoComposition = buildVideoComposition(animationTool: animationTool)
         exportSession?.audioMix = buildAudioMix()
         exportSession?.outputURL = {
             let documentDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).last!
@@ -192,7 +192,7 @@ public class CompositionGenerator {
         return composition
     }
 
-    public func buildVideoComposition() -> AVVideoComposition? {
+    public func buildVideoComposition(animationTool: AVVideoCompositionCoreAnimationTool? = nil) -> AVVideoComposition? {
         if let videoComposition = self.videoComposition, !needRebuildVideoComposition {
             return videoComposition
         }
@@ -242,6 +242,7 @@ public class CompositionGenerator {
         videoComposition.renderSize = self.timeline.renderSize
         videoComposition.instructions = instructions
         videoComposition.customVideoCompositorClass = VideoCompositor.self
+        videoComposition.animationTool = animationTool
         self.videoComposition = videoComposition
         self.needRebuildVideoComposition = false
         return videoComposition

Cabbage/Sources/Track/Resource/Resource.swift

@@ -13,6 +13,12 @@ public struct ResourceTrackInfo {
     public var track: AVAssetTrack
     public var selectedTimeRange: CMTimeRange
     public var scaleToDuration: CMTime
+
+    public init(track: AVAssetTrack, selectedTimeRange: CMTimeRange, scaleToDuration: CMTime) {
+        self.track = track
+        self.selectedTimeRange = selectedTimeRange
+        self.scaleToDuration = scaleToDuration
+    }
 }
 
 
@@ -99,7 +105,7 @@ open class Resource: NSObject, NSCopying, ResourceTrackInfoProvider {
 
     // MARK: - ResourceTrackInfoProvider
 
-    public func trackInfo(for type: AVMediaType, at index: Int) -> ResourceTrackInfo {
+    open func trackInfo(for type: AVMediaType, at index: Int) -> ResourceTrackInfo {
         let track = tracks(for: type)[index]
         let emptyDuration = CMTime(value: 1, 30)
         let emptyTimeRange = CMTimeRangeMake(start: CMTime.zero, duration: emptyDuration)

Package.swift

@@ -4,12 +4,12 @@
 import PackageDescription
 
 let package = Package(
-    name: "Cabbage",
+    name: "SCCabbage",
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
-            name: "Cabbage",
-            targets: ["Cabbage"]),
+            name: "SCCabbage",
+            targets: ["SCCabbage"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -19,18 +19,8 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
-            name: "Cabbage",
-            dependencies: [],
-            linkerSettings: [
-                .linkedFramework(
-                    "AVFoundation",
-                    .when(platforms: [.iOS, .macOS])
-                ),
-                .linkedFramework(
-                    "Foundation",
-                    .when(platforms: [.iOS, .macOS])
-                )
-            ]
+            name: "SCCabbage",
+            dependencies: []
         )
     ]
 )

README.md

@@ -154,7 +154,7 @@ use_frameworks!
 target 'MyApp' do
   # your other pod
   # ...
-  pod 'VFCabbage'
+  pod 'SCCabbage', :git => 'https://github.com/kre8tv/SCCabbage'
 end
 ```
 
@@ -167,7 +167,7 @@ You can
 - Or add Cabbage as a submodule.
 
 ```
-$ git submodule add https://github.com/VideoFlint/Cabbage.git
+$ git submodule add https://github.com/kre8tv/SCCabbage
 ```
 
 ## Requirements

VFCabbage.podspec → SCCabbage.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
-    s.name = 'VFCabbage'
-    s.version = '0.5.1'
+    s.name = 'SCCabbage'
+    s.version = '0.5.2'
     s.summary = 'A high-level video composition framework build on top of AVFoundation. It\'s simple to use and easy to extend.'
 
     s.description  = <<-DESC
@@ -15,14 +15,14 @@ Pod::Spec.new do |s|
 
     s.license = { :type => "MIT", :file => "LICENSE" }
 
-    s.homepage = 'https://github.com/VideoFlint/Cabbage'
+    s.homepage = 'https://github.com/kre8tv/SCCabbage'
 
     s.author = { 'Vito' => 'vvitozhang@gmail.com' }
 
     s.platform = :ios, '9.0'
     s.swift_version = "4.2"
 
-    s.source = { :git => 'https://github.com/VideoFlint/Cabbage.git', :tag => s.version.to_s }
+    s.source = { :git => 'https://github.com/kre8tv/SCCabbage.git', :tag => s.version.to_s }
     s.source_files = ['Cabbage/Sources/core/**/*.swift', 'Cabbage/Sources/**/*.swift']
     s.resource_bundles = { 'Cabbage' => 'Cabbage/Sources/Resource/*.mp4' }