refactoring

Author: swiftuiux

Sources/swiftui-loop-videoplayer/fn/fn+.swift

@@ -110,3 +110,24 @@ internal func handleVideoComposition(request: AVAsynchronousCIImageFilteringRequ
     // Finish the composition request by outputting the final image
     request.finish(with: currentImage, context: nil)
 }
+
+/// Combines an array of CIFilters with additional brightness and contrast adjustments.
+///
+/// This function appends brightness and contrast adjustments as CIFilters to the existing array of filters.
+///
+/// - Parameters:
+///   - filters: An array of CIFilter objects to which the brightness and contrast filters will be added.
+///   - brightness: A Float value representing the brightness adjustment to apply.
+///   - contrast: A Float value representing the contrast adjustment to apply.
+///
+/// - Returns: An array of CIFilter objects, including the original filters and the added brightness and contrast adjustments.
+internal func combineFilters(_ filters: [CIFilter],_ brightness:  Float,_ contrast: Float) -> [CIFilter] {
+    var allFilters = filters
+    if let filter = CIFilter(name: "CIColorControls", parameters: [kCIInputBrightnessKey: brightness]) {
+        allFilters.append(filter)
+    }
+    if let filter = CIFilter(name: "CIColorControls", parameters: [kCIInputContrastKey: contrast]) {
+        allFilters.append(filter)
+    }
+    return allFilters
+}

Sources/swiftui-loop-videoplayer/protocol/view/AbstractPlayer.swift

@@ -259,28 +259,14 @@ extension AbstractPlayer{
         filters.append(value)
     }
 
-    /// Combines all currently applied filters with brightness and contrast adjustments.
-    /// Brightness and contrast are applied as additional filters on top of the existing filters in the stack.
-    /// - Returns: An array of CIFilter objects that include the existing filters and the brightness/contrast adjustments.
-    private var combineFilters: [CIFilter] {
-        var allFilters = filters
-        if let filter = CIFilter(name: "CIColorControls", parameters: [kCIInputBrightnessKey: brightness]) {
-            allFilters.append(filter)
-        }
-        if let filter = CIFilter(name: "CIColorControls", parameters: [kCIInputContrastKey: contrast]) {
-            allFilters.append(filter)
-        }
-        return allFilters
-    }
-
     /// Applies the current set of filters to the video using an AVVideoComposition.
     /// This method combines the existing filters and brightness/contrast adjustments, creates a new video composition,
     /// and assigns it to the current AVPlayerItem. The video is paused during this process to ensure smooth application.
     /// This method is not supported on Vision OS.
     func applyVideoComposition() {
         guard let player = player, let currentItem = player.currentItem else { return }
 
-        let allFilters = combineFilters
+        let allFilters = combineFilters(filters, brightness, contrast)
         #if !os(visionOS)
         // Might be heavy operation need to explore
         let videoComposition = AVVideoComposition(asset: currentItem.asset, applyingCIFiltersWithHandler: { request in
@@ -305,7 +291,14 @@ extension AbstractPlayer{
         #endif
     }
 
-    /// Removes all filters from the video playback.
+    /// Removes all applied CIFilters from the video playback.
+    ///
+    /// This function clears the array of filters and optionally re-applies the video composition
+    /// to ensure the changes take effect immediately.
+    ///
+    /// - Parameters:
+    ///   - apply: A Boolean value indicating whether to immediately apply the video composition after removing the filters.
+    ///            Defaults to `true`.
     func removeAllFilters(apply : Bool = true) {
 
         guard !filters.isEmpty else { return }