update

Author: swiftuiux

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

@@ -243,27 +243,14 @@ func mergeAssetWithSubtitles(videoAsset: AVURLAsset, subtitleAsset: AVURLAsset)
 ///   - duration: A `CMTime` value representing the total duration of the media.
 ///               This value must be valid for the calculation to work correctly.
 /// - Returns: A `CMTime` value representing the resolved seek position within the media.
-func getSeekTime(for time: Double, duration : CMTime) -> CMTime?{
+@MainActor
+func getSeekTime(for time: Double, duration: CMTime) -> CMTime? {
+    guard duration.isNumeric && duration.value != 0 else { return nil }
 
-    guard duration.value != 0 else{  return nil }
+    let endSeconds = CMTimeGetSeconds(duration)
+    let clampedSeconds = max(0, min(time, endSeconds))
 
-    let endTime = CMTimeGetSeconds(duration)
-    let seekTime : CMTime
-    
-    if time < 0 {
-        // If the time is negative, seek to the start of the video
-        seekTime = .zero
-    } else if time >= endTime {
-        // If the time exceeds the video duration, seek to the end of the video
-        let endCMTime = CMTime(seconds: endTime, preferredTimescale: duration.timescale)
-        seekTime = endCMTime
-    } else {
-        // Otherwise, seek to the specified time
-        let seekCMTime = CMTime(seconds: time, preferredTimescale: duration.timescale)
-        seekTime = seekCMTime
-    }
-    
-    return seekTime
+    return CMTime(seconds: clampedSeconds, preferredTimescale: duration.timescale)
 }
 
 /// Creates an `AVPlayerItem` with optional subtitle merging.

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

@@ -137,7 +137,8 @@ public protocol AbstractPlayer: AnyObject {
     func update(settings: VideoSettings)
 }
 
-extension AbstractPlayer{
+@MainActor
+public extension AbstractPlayer{
 
     /// Retrieves the current item being played.
     ///

Sources/swiftui-loop-videoplayer/protocol/player/ExtPlayerProtocol.swift

@@ -71,6 +71,7 @@ public protocol ExtPlayerProtocol: AbstractPlayer, LayerMakerProtocol{
     func onError(_ error : VPErrors)
 }
 
+@MainActor
 internal extension ExtPlayerProtocol {
 
     /// Initializes a new player view with a video asset and custom settings.
@@ -133,11 +134,13 @@ internal extension ExtPlayerProtocol {
     ///   - player: The `AVQueuePlayer` instance to which the time observer will be added.
     ///   - settings: A `VideoSettings` object containing the time publishing interval and related configuration.
     func configureTimePublishing(_ player: AVQueuePlayer, _ settings: VideoSettings) {
-        if let timePublishing = settings.timePublishing{
-            timeObserver = player.addPeriodicTimeObserver(forInterval: timePublishing, queue: .global()) { [weak self] time in
-                guard let self = self else{ return }
+        if let timePublishing = settings.timePublishing {
+            timeObserver = player.addPeriodicTimeObserver(
+                forInterval: timePublishing,
+                queue: .main
+            ) { [weak self] time in
                 Task { @MainActor in
-                    self.delegate?.didPassedTime(seconds: time.seconds)
+                    self?.delegate?.didPassedTime(seconds: time.seconds)
                 }
             }
         }

Sources/swiftui-loop-videoplayer/view/player/ios/ExtPlayerUIView.swift

@@ -141,8 +141,9 @@ internal class ExtPlayerUIView: UIView, ExtPlayerProtocol{
     func setupPiP(delegate: AVPictureInPictureControllerDelegate) {
         // Check if PiP is supported
         guard AVPictureInPictureController.isPictureInPictureSupported() else {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 1){ [weak self] in
-                self?.onError(.notSupportedPiP)
+            Task { @MainActor in
+                try? await Task.sleep(nanoseconds: 1_000_000_000)
+                self.onError(.notSupportedPiP)
             }
             return
         }

Sources/swiftui-loop-videoplayer/view/player/mac/ExtPlayerNSView.swift

@@ -77,6 +77,7 @@ internal class ExtPlayerNSView: NSView, ExtPlayerProtocol {
         player = AVQueuePlayer(items: [])
 
         super.init(frame: .zero)
+        self.wantsLayer = true
 
         addPlayerLayer()
         addCompositeLayer(settings)