Fix video looping: replace AVPlayerLooper with seek-based approach and downgrade to AVPlayer

Author: x401om

Sources.UIBuilder/UIBuilder/Logic/AdaptyVideoViewModel.swift

@@ -39,12 +39,12 @@ class AdaptyUIVideoPlayerManager: NSObject, ObservableObject {
     }
 
     @Published var playerState: PlayerState = .invalid
-    @Published var player: AVQueuePlayer?
+    @Published var player: AVPlayer?
 
     private let onStateUpdated: (PlayerState) -> Void
 
-    private var playerLooper: AVPlayerLooper?
     private var playerStatusObservation: NSKeyValueObservation?
+    private nonisolated(unsafe) var loopObserver: (any NSObjectProtocol)?
 
     init(
         video: VC.VideoData,
@@ -54,20 +54,25 @@ class AdaptyUIVideoPlayerManager: NSObject, ObservableObject {
     ) {
         let video = video.resolve(with: assetsResolver)
         player = video.player
-        // preview image : video.image
-        if loop {
-            playerLooper = AVPlayerLooper(player: video.player, templateItem: video.item)
-        } else {
-            playerLooper = nil
-        }
-
         self.onStateUpdated = onStateUpdated
 
         super.init()
 
+        if loop {
+            video.player.actionAtItemEnd = .none
+            loopObserver = NotificationCenter.default.addObserver(
+                forName: .AVPlayerItemDidPlayToEndTime,
+                object: video.item,
+                queue: .main
+            ) { [weak self] _ in
+                self?.player?.seek(to: .zero)
+                self?.player?.play()
+            }
+        }
+
         playerStatusObservation = video.item.observe(
             \.status,
-            options: [.old, .new, .initial, .prior],
+            options: [.new, .initial],
             changeHandler: { [weak self] item, _ in
                 DispatchQueue.main.async { [weak self] in
                     self?.playerStatusDidChange(item.status, item: item)
@@ -103,6 +108,9 @@ class AdaptyUIVideoPlayerManager: NSObject, ObservableObject {
     deinit {
         playerStatusObservation?.invalidate()
         playerStatusObservation = nil
+        if let loopObserver {
+            NotificationCenter.default.removeObserver(loopObserver)
+        }
     }
 }
 

Sources.UIBuilder/UIBuilder/Rendering/Elements/AdaptyUI+AssetsResolver.swift

@@ -13,7 +13,7 @@ import SwiftUI
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, visionOS 1.0, *)
 extension VC.VideoData {
     struct Resolved {
-        let player: AVQueuePlayer
+        let player: AVPlayer
         let item: AVPlayerItem
         let image: VC.ImageData.Resolved?
     }
@@ -27,7 +27,7 @@ extension VC.VideoData {
 
     private var resolved: Resolved {
         let item = AVPlayerItem(url: url)
-        let player = AVQueuePlayer(items: [item])
+        let player = AVPlayer(playerItem: item)
         player.isMuted = true
 
         return Resolved(
@@ -184,9 +184,9 @@ private extension AdaptyUICustomVideoAsset {
         case let .file(url, preview),
              let .remote(url, preview):
             let playerItem = AVPlayerItem(url: url)
-            let queuePlayer = AVQueuePlayer(items: [playerItem])
-            queuePlayer.isMuted = true
-            return .init(player: queuePlayer, item: playerItem, image: preview.flatMap { $0.resolved })
+            let player = AVPlayer(playerItem: playerItem)
+            player.isMuted = true
+            return .init(player: player, item: playerItem, image: preview.flatMap { $0.resolved })
         case let .player(item, player, preview):
             return .init(player: player, item: item, image: preview.flatMap { $0.resolved })
         }

Sources.UIBuilder/UIBuilder/Rendering/Elements/AdaptyUIVideoPlayerView.swift

@@ -56,7 +56,7 @@ struct AdaptyUIVideoPlayerView: UIViewControllerRepresentable {
 #else
             playerStatusObservation = playerViewController.observe(
                 \.isReadyForDisplay,
-                options: [.old, .new, .initial, .prior],
+                options: [.new, .initial],
                 changeHandler: { playerVC, _ in
                     DispatchQueue.main.async {
                         if playerVC.isReadyForDisplay {