android player

smoother

basic caching

prep cache

somewhat works

backup

other files

android impl

blegh

lets go

touchup

add prefetch to js

use caching

modules/expo-bluesky-video-player/ios/PlayerController.swift

@@ -1,9 +1,9 @@
 import AVKit
 
 class PlayerController: AVPlayerViewController, AVPlayerViewControllerDelegate {
-  private var playerLooper: AVPlayerLooper? = nil
   var source: String? = nil
   var _superview: ExpoBlueskyVideoPlayerView? = nil
+  var needsCaching = true
   
   var isInUse = false
   var playerItem:  AVPlayerItem?  {
@@ -11,13 +11,7 @@ class PlayerController: AVPlayerViewController, AVPlayerViewControllerDelegate {
       return self.player?.currentItem
     }
     set {
-      if newValue == nil {
-        if let player = self.player as? AVQueuePlayer {
-          player.removeAllItems()
-        }
-      } else {
-        self.player?.replaceCurrentItem(with: newValue)
-      }
+      self.player?.replaceCurrentItem(with: newValue)
     }
   }
   var itemStatus: AVPlayerItem.Status? {
@@ -32,7 +26,11 @@ class PlayerController: AVPlayerViewController, AVPlayerViewControllerDelegate {
   
   override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
     super.init(nibName: nil, bundle: nil)
-    self.player = AVQueuePlayer()
+    
+    let player = AVPlayer()
+    player.actionAtItemEnd = .none
+    player.volume = .zero
+    self.player = player
     
     self.delegate = self
     self.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
@@ -44,63 +42,69 @@ class PlayerController: AVPlayerViewController, AVPlayerViewControllerDelegate {
     if #available(iOS 16.0, *) {
       self.allowsVideoFrameAnalysis = false
     }
-    
-    self.player?.actionAtItemEnd = .pause
-    self.player?.volume = .zero
+  }
+  
+  deinit {
+    self.release()
   }
 
   func setFrame(rect: CGRect) {
     self.view.frame = rect
   }
   
-  public override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-    if keyPath == "status", let playerItem = object as? AVPlayerItem {
-      if playerItem.status == .readyToPlay, let player = self.player as? AVQueuePlayer {
-        // GIFs frequently have some black frames at the end of the video. To account for that, we offset the duration by 100ms,
-        // which should be enough frames to prevent a flicker.
-        player.play()
-        self.setLooper()
+  @objc func playerItemDidReachEnd(notification: Notification) {
+    if let playerItem = notification.object as? AVPlayerItem {
+      playerItem.seek(to: CMTime.zero, completionHandler: nil)
+      
+      if self.needsCaching, let asset = self.playerItem?.asset as? AVURLAsset {
+        PlayerItemManager.shared.saveToCache(source: asset.url.absoluteString)
+        self.needsCaching = false
       }
     }
   }
   
-  private func setLooper() {
-    guard let player = self.player as? AVQueuePlayer, let playerItem = self.playerItem else {
-      return
+  public override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+    if keyPath == "status", let playerItem = object as? AVPlayerItem {
+      if playerItem.status == .readyToPlay, let player = self.player {
+        if _superview?.autoplay == true, _superview?.isPlaying == true {
+          player.play()
+        }
+      }
     }
-    
-    let duration = playerItem.duration
-    self.playerLooper = AVPlayerLooper(
-      player: player,
-      templateItem: playerItem,
-      timeRange: CMTimeRange(
-        start: CMTime(value: 0, timescale: duration.timescale),
-        duration: CMTime(value: duration.value - 100, timescale: 1000)
-      )
-    )
   }
   
   func initForView(_ source: String, view: ExpoBlueskyVideoPlayerView) {
-    if let playerItem = PlayerItemManager.shared.getOrAddItem(source: source) {
+    if let playerItemAndInfo = PlayerItemManager.shared.getItem(source: source) {
+      let playerItem = playerItemAndInfo.0
+      self.needsCaching = !playerItemAndInfo.1
+      
       playerItem.addObserver(self, forKeyPath: "status", options: [.old, .new], context: nil)
+      NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(playerItemDidReachEnd(notification:)),
+        name: AVPlayerItem.didPlayToEndTimeNotification,
+       object: playerItem
+      )
+      
       self.isInUse = true
       self.source = source
       self.playerItem = playerItem
       self._superview = view
-      
-      if view.isPlaying, self.itemStatus == .readyToPlay {
-        self.play()
-        self.setLooper()
-      }
     }
   }
   
   func release() {
+    NotificationCenter.default.removeObserver(
+      self,
+      name: AVPlayerItem.didPlayToEndTimeNotification,
+      object: self.playerItem
+    )
+    
+    self.needsCaching = true
     self.isInUse = false
     self.pause()
-    self.source = nil
-    self.playerLooper = nil
     self.playerItem = nil
+    self.removeFromParent()
   }
   
   func play() {