expo-video 2.2.0 → 2.2.1

package/CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### 💡 Others
 
+## 2.2.1 — 2025-06-10
+
+_This version does not introduce any user-facing changes._
+
 ## 2.2.0 — 2025-06-04
 
 ### 🎉 New features
@@ -21,6 +25,10 @@
 - [Android] Fix `onFirstFrameRender` not being emitted for sources with `pixelWidthHeightRatio` different than 1. ([#37009](https://github.com/expo/expo/pull/37009) by [@behenate](https://github.com/behenate))
 - [Android] Fix `useExoShutter` prop not being exposed to the JS side. ([#37012](https://github.com/expo/expo/pull/37012) by [@behenate](https://github.com/behenate))
 - [Android] Add missing `onFirstFrameRender` event to the `VideoView` definition. ([#37014](https://github.com/expo/expo/pull/37014) by [@behenate](https://github.com/behenate))
+- [iOS] Fix player not entering 'error' state when loading fails on iOS. ([#37177](https://github.com/expo/expo/pull/37177) by [@behenate](https://github.com/behenate))
+- [iOS] Fix player reporting status `readyToPlay` while a source is being loaded asynchronously. ([#37180](https://github.com/expo/expo/pull/37180) by [@behenate](https://github.com/behenate))
+- [iOS] Fix player going into `loading` status for a single frame when unpausing with a full buffer. ([#37181](https://github.com/expo/expo/pull/37181) by [@behenate](https://github.com/behenate))
+- [iOS] Fix player getting stuck in `loading` state for null sources. ([#37183](https://github.com/expo/expo/pull/37183) by [@behenate](https://github.com/behenate))
 
 ## 2.1.9 — 2025-05-08
 

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '2.2.0'
+version = '2.2.1'
 
 android {
   namespace "expo.modules.video"
   defaultConfig {
     versionCode 1
-    versionName '2.2.0'
+    versionName '2.2.1'
   }
 }
 

package/expo-module.config.json

@@ -8,7 +8,7 @@
     "publication": {
       "groupId": "host.exp.exponent",
       "artifactId": "expo.modules.video",
-      "version": "2.2.0",
+      "version": "2.2.1",
       "repository": "local-maven-repo"
     }
   }

package/ios/VideoPlayer.swift

@@ -169,7 +169,7 @@ internal final class VideoPlayer: SharedRef<AVPlayer>, Hashable, VideoPlayerObse
 
   private override init(_ ref: AVPlayer) {
     super.init(ref)
-    observer = VideoPlayerObserver(owner: self)
+    observer = VideoPlayerObserver(owner: self, videoSourceLoader: videoSourceLoader)
     observer?.registerDelegate(delegate: self)
     VideoManager.shared.register(videoPlayer: self)
 

package/ios/VideoPlayerItem.swift

@@ -37,7 +37,9 @@ class VideoPlayerItem: AVPlayerItem {
 
     let asset = VideoAsset(url: url, videoSource: videoSource)
     self.urlAsset = asset
-    _ = try await asset.load(.duration, .preferredTransform, .isPlayable)
+    // We can ignore any exceptions thrown during the load. The asset will be assigned to the `VideoPlayer` anyways
+    // and cause it to go into .error state trigerring the `onStatusChange` event.
+    _ = try? await asset.load(.duration, .preferredTransform, .isPlayable)
 
     super.init(asset: urlAsset, automaticallyLoadedAssetKeys: nil)
     self.createTracksLoadingTask()

package/ios/VideoPlayerObserver.swift

@@ -69,13 +69,15 @@ final class WeakPlayerObserverDelegate: Hashable {
   }
 }
 
-class VideoPlayerObserver {
+class VideoPlayerObserver: VideoSourceLoaderListener {
   private weak var owner: VideoPlayer?
+  private weak var videoSourceLoader: VideoSourceLoader?
   var player: AVPlayer? {
     owner?.ref
   }
   var delegates = Set<WeakPlayerObserverDelegate>()
   private var currentItem: VideoPlayerItem?
+  private var isLoadingAsynchronously = false
   private var loadedCurrentItem = false
   private var periodicTimeObserver: Any?
   private var currentVideoTrack: VideoTrack? {
@@ -98,11 +100,21 @@ class VideoPlayerObserver {
     }
   }
   private var error: Exception?
-  private var status: PlayerStatus = .idle {
-    didSet {
-      if let player, oldValue != status {
+  private var _status: PlayerStatus = .idle
+  private var status: PlayerStatus {
+    get {
+      return _status
+    }
+    set {
+      if newValue != .loading && isLoadingAsynchronously {
+        return
+      }
+
+      if let player, newValue != status {
+        let oldStatus = self._status
+        _status = newValue
         delegates.forEach { delegate in
-          delegate.value?.onStatusChanged(player: player, oldStatus: oldValue, newStatus: status, error: error)
+          delegate.value?.onStatusChanged(player: player, oldStatus: oldStatus, newStatus: status, error: error)
         }
       }
     }
@@ -127,9 +139,11 @@ class VideoPlayerObserver {
   private var currentSubtitlesObserver: NSObjectProtocol?
   private var currentAudioTracksObserver: NSObjectProtocol?
 
-  init(owner: VideoPlayer) {
+  init(owner: VideoPlayer, videoSourceLoader: VideoSourceLoader) {
     self.owner = owner
+    self.videoSourceLoader = videoSourceLoader
     initializePlayerObservers()
+    self.videoSourceLoader?.registerListener(listener: self)
   }
 
   deinit {
@@ -146,6 +160,7 @@ class VideoPlayerObserver {
   }
 
   func cleanup() {
+    self.videoSourceLoader?.unregisterListener(listener: self)
     delegates.removeAll()
     invalidatePlayerObservers()
     invalidateCurrentPlayerItemObservers()
@@ -347,24 +362,18 @@ class VideoPlayerObserver {
     if player?.status != .failed {
       error = nil
     }
-
-    switch playerItem.status {
-    case .unknown:
+    if owner?.videoSourceLoader.isLoading == true {
       status = .loading
-    case .failed:
-      // The AVPlayerItem.error can't be modified, so we have a custom field for caching errors
-      let playerItemError = (playerItem as? VideoPlayerItem)?.urlAsset.cachingError ?? error
+      return
+    }
+
+    let newStatus = playerItem.status.toVideoPlayerStatus(isPlaybackBufferEmpty: playerItem.isPlaybackBufferEmpty)
+
+    // The AVPlayerItem.error can't be modified, so we have a custom field for caching errors
+    if newStatus == .error {
+      let playerItemError = (playerItem as? VideoPlayerItem)?.urlAsset.cachingError ?? playerItem.error ?? error
       error = PlayerItemLoadException(playerItemError?.localizedDescription)
       status = .error
-    case .readyToPlay:
-      if playerItem.isPlaybackBufferEmpty {
-        status = .loading
-      } else {
-        status = .readyToPlay
-      }
-    @unknown default:
-      log.error("Unhandled `AVPlayerItem.Status` value: \(playerItem.status), returning `.loading` as fallback. Add the missing case as soon as possible.")
-      status = .loading
     }
 
     if let player, !loadedCurrentItem && (status == .readyToPlay || status == .error) {
@@ -400,7 +409,16 @@ class VideoPlayerObserver {
     if player.timeControlStatus != .waitingToPlayAtSpecifiedRate && player.status == .readyToPlay && currentItem?.isPlaybackBufferEmpty != true {
       status = .readyToPlay
     } else if player.timeControlStatus == .waitingToPlayAtSpecifiedRate {
-      status = .loading
+      switch player.reasonForWaitingToPlay {
+      case .noItemToPlay:
+        status = .idle
+      case .evaluatingBufferingRate:
+        // Every time the player is unpaused timeControlStatus goes into .waitingToPlayAtSpecifiedRate while evaluating buffering rate.
+        // This takes less than a frame and we can ignore this change to avoid unnecessary status changes.
+        break
+      default:
+        status = .loading
+      }
     }
 
     if isPlaying != (player.timeControlStatus == .playing) {
@@ -445,6 +463,21 @@ class VideoPlayerObserver {
       }
     }
   }
+
+  // MARK: - VideoSourceLoaderListener
+  func onLoadingStarted(loader: VideoSourceLoader, videoSource: VideoSource?) {
+    isLoadingAsynchronously = true
+    status = .loading
+  }
+
+  func onLoadingCancelled(loader: VideoSourceLoader, videoSource: VideoSource?) {
+    isLoadingAsynchronously = false
+    status = .idle
+  }
+
+  func onLoadingFinished(loader: VideoSourceLoader, videoSource: VideoSource?, result: VideoPlayerItem?) {
+    isLoadingAsynchronously = false
+  }
 }
 
 private extension AVPlayerItemAccessLogEvent {
@@ -469,3 +502,22 @@ private extension AVPlayerItemAccessLogEvent {
     return videoTracks.first { $0.id == id }
   }
 }
+
+fileprivate extension AVPlayerItem.Status {
+  func toVideoPlayerStatus(isPlaybackBufferEmpty: Bool) -> PlayerStatus {
+    switch self {
+    case .unknown:
+      return .loading
+    case .failed:
+      return .error
+    case .readyToPlay:
+      if isPlaybackBufferEmpty {
+        return .loading
+      }
+      return .readyToPlay
+    @unknown default:
+      log.error("Unhandled `AVPlayerItem.Status` value: \(self), returning `.loading` as fallback. Add the missing case as soon as possible.")
+      return .loading
+    }
+  }
+}

package/ios/VideoSourceLoader.swift

@@ -2,7 +2,19 @@ import AVKit
 
 internal class VideoSourceLoader {
   private(set) var isLoading: Bool = true
-  private var currentTask: Task<VideoPlayerItem?, Error>?
+  private var currentSource: VideoSource?
+  private var currentTask: Task<LoadingResult, Error>?
+
+  private var listeners = Set<WeakVideoSourceLoaderListener>()
+
+  func registerListener(listener: VideoSourceLoaderListener) {
+    let weakListener = WeakVideoSourceLoaderListener(value: listener)
+    listeners.insert(weakListener)
+  }
+
+  func unregisterListener(listener: VideoSourceLoaderListener) {
+    listeners.remove(WeakVideoSourceLoaderListener(value: listener))
+  }
 
   /**
    Asynchronously loads a video item from the provided `videoSource`. If another loading operation is in progress, it will be cancelled.
@@ -12,16 +24,31 @@ internal class VideoSourceLoader {
    */
   func load(videoSource: VideoSource) async throws -> VideoPlayerItem? {
     isLoading = true
-    currentTask?.cancel()
+    if let currentTask {
+      currentTask.cancel()
+      listeners.forEach { listener in
+        listener.value?.onLoadingCancelled(loader: self, videoSource: currentSource)
+      }
+    }
 
     let newTask = Task {
       return try await loadImpl(videoSource: videoSource)
     }
 
     self.currentTask = newTask
-    let result = try await newTask.value
+    self.currentSource = videoSource
+    let loadingResult = try await newTask.value
+
+    if !loadingResult.isCancelled {
+      listeners.forEach { listener in
+        listener.value?.onLoadingFinished(loader: self, videoSource: videoSource, result: loadingResult.value)
+      }
+    }
+
     isLoading = false
-    return result
+    self.currentSource = nil
+    self.currentTask = nil
+    return loadingResult.value
   }
 
   func cancelCurrentTask() {
@@ -34,20 +61,29 @@ internal class VideoSourceLoader {
     cancelCurrentTask()
   }
 
-  private func loadImpl(videoSource: VideoSource) async throws -> VideoPlayerItem? {
+  private func loadImpl(videoSource: VideoSource) async throws -> LoadingResult {
+    listeners.forEach { listener in
+      listener.value?.onLoadingStarted(loader: self, videoSource: videoSource)
+    }
+
     guard
       let url = videoSource.uri
     else {
-      return nil
+      return LoadingResult(value: nil, isCancelled: false)
     }
 
     let playerItem = try await VideoPlayerItem(videoSource: videoSource)
 
     if Task.isCancelled {
       print("The loading task has been cancelled")
-      return nil
+      return LoadingResult(value: nil, isCancelled: true)
     }
 
-    return playerItem
+    return LoadingResult(value: playerItem, isCancelled: false)
   }
 }
+
+private struct LoadingResult {
+  let value: VideoPlayerItem?
+  let isCancelled: Bool
+}

package/ios/VideoSourceLoaderListener.swift

@@ -0,0 +1,34 @@
+import Foundation
+
+protocol VideoSourceLoaderListener: AnyObject {
+  func onLoadingStarted(loader: VideoSourceLoader, videoSource: VideoSource?)
+  func onLoadingFinished(loader: VideoSourceLoader, videoSource: VideoSource?, result: VideoPlayerItem?)
+  func onLoadingCancelled(loader: VideoSourceLoader, videoSource: VideoSource?)
+}
+
+extension VideoSourceLoaderListener {
+  func onLoadingStarted(loader: VideoSourceLoader, videoSource: VideoSource?) {}
+  func onLoadingFinished(loader: VideoSourceLoader, videoSource: VideoSource?, result: VideoPlayerItem?) {}
+  func onLoadingCancelled(loader: VideoSourceLoader, videoSource: VideoSource?) {}
+}
+
+final class WeakVideoSourceLoaderListener: Hashable {
+  private(set) weak var value: VideoSourceLoaderListener?
+
+  init(value: VideoSourceLoaderListener? = nil) {
+    self.value = value
+  }
+
+  static func == (lhs: WeakVideoSourceLoaderListener, rhs: WeakVideoSourceLoaderListener) -> Bool {
+    guard let lhsValue = lhs.value, let rhsValue = rhs.value else {
+      return lhs.value == nil && rhs.value == nil
+    }
+    return ObjectIdentifier(lhsValue) == ObjectIdentifier(rhsValue)
+  }
+
+  func hash(into hasher: inout Hasher) {
+    if let value {
+      hasher.combine(ObjectIdentifier(value))
+    }
+  }
+}

package/local-maven-repo/host/exp/exponent/expo.modules.video/{2.2.0/expo.modules.video-2.2.0.module → 2.2.1/expo.modules.video-2.2.1.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.video",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.video-2.2.0.aar",
-          "url": "expo.modules.video-2.2.0.aar",
+          "name": "expo.modules.video-2.2.1.aar",
+          "url": "expo.modules.video-2.2.1.aar",
           "size": 444322,
           "sha512": "a1501f7e947680eba85a049cf0520518bca4feca64832fbdc41383cb2c483f6253ecf8d429ad936966fcce1b0494175035399894dbce9c50f4765bd099edebf1",
           "sha256": "0022fab08b59c4346e67a4bf573af546f4f0e7eb322aee1115335e035318fa2c",
@@ -113,8 +113,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.video-2.2.0.aar",
-          "url": "expo.modules.video-2.2.0.aar",
+          "name": "expo.modules.video-2.2.1.aar",
+          "url": "expo.modules.video-2.2.1.aar",
           "size": 444322,
           "sha512": "a1501f7e947680eba85a049cf0520518bca4feca64832fbdc41383cb2c483f6253ecf8d429ad936966fcce1b0494175035399894dbce9c50f4765bd099edebf1",
           "sha256": "0022fab08b59c4346e67a4bf573af546f4f0e7eb322aee1115335e035318fa2c",
@@ -133,8 +133,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.video-2.2.0-sources.jar",
-          "url": "expo.modules.video-2.2.0-sources.jar",
+          "name": "expo.modules.video-2.2.1-sources.jar",
+          "url": "expo.modules.video-2.2.1-sources.jar",
           "size": 52499,
           "sha512": "c7c374ab88183e831ed5a80a5e7a6f9ef2d29d4157c7b9496e30a9f87b14c4952b1e867b29f8feedbab21badccdf1b751f3a20367d1970a5e814311d96618f0e",
           "sha256": "ff54e2221752092ebdece914b77e4504b2864fc94504c8a1887ea67a2afa5ea0",

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.1/expo.modules.video-2.2.1.module.md5

@@ -0,0 +1 @@
+cb55d9d9221ca022327d2de165aedbee

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.1/expo.modules.video-2.2.1.module.sha1

@@ -0,0 +1 @@
+be39ceedddcaaf953d676467b3927f50e7ed548b

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.1/expo.modules.video-2.2.1.module.sha256

@@ -0,0 +1 @@
+53814f15e51286b6229b601265835761f6c64266002c3216fb933fda817efbb2

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.1/expo.modules.video-2.2.1.module.sha512

@@ -0,0 +1 @@
+0954a801c43e9242b4db377ad2b306f55d0f85dea74e8cb11aa206ed7ff680d00ea98ed496496987c4ed87af271f01f16bfff9909ed713aec68321b9abb4704e

package/local-maven-repo/host/exp/exponent/expo.modules.video/{2.2.0/expo.modules.video-2.2.0.pom → 2.2.1/expo.modules.video-2.2.1.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.video</artifactId>
-  <version>2.2.0</version>
+  <version>2.2.1</version>
   <packaging>aar</packaging>
   <name>expo.modules.video</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.1/expo.modules.video-2.2.1.pom.md5

@@ -0,0 +1 @@
+8a19fd97be9c8431c90093d64de9b613

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.1/expo.modules.video-2.2.1.pom.sha1

@@ -0,0 +1 @@
+0e372e48b5871a6a0626cd97273f6c85e835f4a9

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.1/expo.modules.video-2.2.1.pom.sha256

@@ -0,0 +1 @@
+b3296cfce3d47bb8a61f69e5faea5ce137f18fece4687b2e24310c974d0d97b5

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.1/expo.modules.video-2.2.1.pom.sha512

@@ -0,0 +1 @@
+bbd813cc4afc824a0160cbc648f16b3261b5f223cc78cd29135188337d54c7928cd90c7ec13e87991b7de47c4a4fab6b96e8db1775bcc503ade8fbf3ac036570

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>host.exp.exponent</groupId>
   <artifactId>expo.modules.video</artifactId>
   <versioning>
-    <latest>2.2.0</latest>
-    <release>2.2.0</release>
+    <latest>2.2.1</latest>
+    <release>2.2.1</release>
     <versions>
-      <version>2.2.0</version>
+      <version>2.2.1</version>
     </versions>
-    <lastUpdated>20250604230414</lastUpdated>
+    <lastUpdated>20250610113903</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.md5

@@ -1 +1 @@
-d7576712c099005e0070a39cce656ca6
+d175f56e996dbf7ca76d75bfe82c4d41

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha1

@@ -1 +1 @@
-52a901eebefa6fac0c034b76185f5386b9113588
+1776813ac995e4f770f3461f9f4f7d125c03b710

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha256

@@ -1 +1 @@
-28ab1754acdffea060d818f3e54d1bfc0823de6c803276cf828c4371524eb793
+56169c737354e30bd868954cb30731441d9fceba388fcf1274f0ee5462378bb3

package/local-maven-repo/host/exp/exponent/expo.modules.video/maven-metadata.xml.sha512

@@ -1 +1 @@
-1eb28fa579897d17888ae6f4f6dc0f996daf6c967f6dba0e239386c00c42e399b4dce3b2a8274364679e4c562ccd3b619c4e3271b0a4ed695c29b5097711c710
+abde90e836a99c9272468d5749616b4e8cc162fb1d56fc7d4e7cc62e6233feaffb9e3cbd00c2d7f1af598756ace51c63b55e7b388552a93c5aaf8bed81786bf3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-video",
   "title": "Expo Video",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A cross-platform, performant video component for React Native and Expo with Web support",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -38,5 +38,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "7638c800b57fe78f57cc7f129022f58e84a523c5"
+  "gitHead": "d0b4f7c27a356e8c53bfe45db39fff9e96906a2e"
 }

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.0/expo.modules.video-2.2.0.module.md5

@@ -1 +0,0 @@
-c865db9b1b7212c590b04d5b3d025a92

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.0/expo.modules.video-2.2.0.module.sha1

@@ -1 +0,0 @@
-6c020a0af93440c2dfa817c46c65626c0be15fa5

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.0/expo.modules.video-2.2.0.module.sha256

@@ -1 +0,0 @@
-dc4736ff81e3bdb761a88697e35d0a7612f679f84daab0b6f4147510254413f2

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.0/expo.modules.video-2.2.0.module.sha512

@@ -1 +0,0 @@
-8e05e96b0ea1f0b9c965ea20642b5654d498a8be3dadfe985675d0b0dbccb06b35dae83f2a0dde27019b678f7c73a8b1cb1dab61503a658150f6a4f55560348b

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.0/expo.modules.video-2.2.0.pom.md5

@@ -1 +0,0 @@
-54ababb6162596e7ddfa9e1e415a0fd1

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.0/expo.modules.video-2.2.0.pom.sha1

@@ -1 +0,0 @@
-49d5a63d0c4fbfb5dc9f9d45ea1512c281f2a5a2

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.0/expo.modules.video-2.2.0.pom.sha256

@@ -1 +0,0 @@
-af02050cf8898237faf34bc624abff592a33c4a86a34352ea485a4c3d00361f3

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.0/expo.modules.video-2.2.0.pom.sha512

@@ -1 +0,0 @@
-6354cc8b4f6fc7cdb027d5c6302584ed0d5f8c79c61b77921dd6ffe0f751a1465eae20c7ae3f505a19070ea5f57edcbaff7a6af19934124f740461e734dc0f96