expo-video 2.2.0 → 2.2.2

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 2.2.2 — 2025-06-18
+
+### 🐛 Bug fixes
+
+- [Android] Fix aspect ratio of the Picture in Picture window when auto-entering for sources with ratio different from 16:9. ([#37225](https://github.com/expo/expo/pull/37225) by [@behenate](https://github.com/behenate))
+
+## 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 +31,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.2'
 
 android {
   namespace "expo.modules.video"
   defaultConfig {
     versionCode 1
-    versionName '2.2.0'
+    versionName '2.2.2'
   }
 }
 

package/android/src/main/java/expo/modules/video/FullscreenPlayerActivity.kt

@@ -12,8 +12,9 @@ import android.widget.ImageButton
 import androidx.media3.ui.PlayerView
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.video.player.VideoPlayer
-import expo.modules.video.utils.applyAutoEnterPiP
+import expo.modules.video.utils.applyPiPParams
 import expo.modules.video.utils.applyRectHint
+import expo.modules.video.utils.calculatePiPAspectRatio
 import expo.modules.video.utils.calculateRectHint
 
 @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
@@ -44,7 +45,10 @@ class FullscreenPlayerActivity : Activity() {
     videoPlayer = videoView.videoPlayer
     videoPlayer?.changePlayerView(playerView)
     VideoManager.registerFullscreenPlayerActivity(hashCode().toString(), this)
-    applyAutoEnterPiP(this, videoView.autoEnterPiP)
+    playerView.player?.let {
+      val aspectRatio = calculatePiPAspectRatio(it.videoSize, playerView.width, playerView.height, videoView.contentFit)
+      applyPiPParams(this, videoView.autoEnterPiP, aspectRatio)
+    }
   }
 
   override fun onPostCreate(savedInstanceState: Bundle?) {

package/android/src/main/java/expo/modules/video/VideoView.kt

@@ -15,6 +15,7 @@ import android.widget.FrameLayout
 import android.widget.ImageButton
 import androidx.fragment.app.FragmentActivity
 import androidx.media3.common.Tracks
+import androidx.media3.common.VideoSize
 import androidx.media3.ui.PlayerView
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
@@ -27,8 +28,13 @@ import expo.modules.video.delegates.IgnoreSameSet
 import expo.modules.video.enums.ContentFit
 import expo.modules.video.player.VideoPlayer
 import expo.modules.video.player.VideoPlayerListener
-import expo.modules.video.utils.applyAutoEnterPiP
+import expo.modules.video.records.AudioTrack
+import expo.modules.video.records.SubtitleTrack
+import expo.modules.video.records.VideoSource
+import expo.modules.video.records.VideoTrack
+import expo.modules.video.utils.applyPiPParams
 import expo.modules.video.utils.applyRectHint
+import expo.modules.video.utils.calculatePiPAspectRatio
 import expo.modules.video.utils.calculateRectHint
 import expo.modules.video.utils.dispatchMotionEvent
 import java.util.UUID
@@ -82,7 +88,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     }
 
   var autoEnterPiP: Boolean by IgnoreSameSet(false) { new, _ ->
-    applyAutoEnterPiP(currentActivity, new)
+    applyPiPParams(currentActivity, new, calculateCurrentPipAspectRatio())
   }
 
   var contentFit: ContentFit = ContentFit.CONTAIN
@@ -178,7 +184,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
       currentActivity.overridePendingTransition(0, 0)
     }
     onFullscreenEnter(Unit)
-    applyAutoEnterPiP(currentActivity, false)
+    applyPiPParams(currentActivity, false, calculateCurrentPipAspectRatio())
   }
 
   fun attachPlayer() {
@@ -192,7 +198,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     attachPlayer()
     onFullscreenExit(Unit)
     isInFullscreen = false
-    applyAutoEnterPiP(currentActivity, autoEnterPiP)
+    applyPiPParams(currentActivity, autoEnterPiP, calculateCurrentPipAspectRatio())
   }
 
   fun enterPictureInPicture() {
@@ -203,32 +209,9 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     val player = playerView.player
       ?: throw PictureInPictureEnterException("No player attached to the VideoView")
     playerView.useController = false
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      var aspectRatio = if (contentFit == ContentFit.CONTAIN) {
-        Rational(player.videoSize.width, player.videoSize.height)
-      } else {
-        Rational(width, height)
-      }
-      // AspectRatio for the activity in picture-in-picture, must be between 2.39:1 and 1:2.39 (inclusive).
-      // https://developer.android.com/reference/android/app/PictureInPictureParams.Builder#setAspectRatio(android.util.Rational)
-      val maximumRatio = Rational(239, 100)
-      val minimumRatio = Rational(100, 239)
-      if (aspectRatio.toFloat() > maximumRatio.toFloat()) {
-        aspectRatio = maximumRatio
-      } else if (aspectRatio.toFloat() < minimumRatio.toFloat()) {
-        aspectRatio = minimumRatio
-      }
-
-      currentActivity.setPictureInPictureParams(
-        PictureInPictureParams
-          .Builder()
-          .setAspectRatio(aspectRatio)
-          .build()
-      )
-    }
-
+    applyPiPParams(currentActivity, autoEnterPiP, calculateCurrentPipAspectRatio())
     willEnterPiP = true
+
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       currentActivity.enterPictureInPictureMode(PictureInPictureParams.Builder().build())
     } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -237,6 +220,11 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     }
   }
 
+  private fun calculateCurrentPipAspectRatio(): Rational? {
+    val player = videoPlayer?.player ?: return null
+    return calculatePiPAspectRatio(player.videoSize, this.width, this.height, contentFit)
+  }
+
   /**
    * For optimal picture in picture experience it's best to only have one view. This method
    * hides all children of the root view and makes the player the only visible child of the rootView.
@@ -263,6 +251,22 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     this.addView(playerView)
   }
 
+  override fun onVideoSourceLoaded(
+    player: VideoPlayer,
+    videoSource: VideoSource?,
+    duration: Double?,
+    availableVideoTracks: List<VideoTrack>,
+    availableSubtitleTracks: List<SubtitleTrack>,
+    availableAudioTracks: List<AudioTrack>
+  ) {
+    availableVideoTracks.firstOrNull()?.let {
+      val videoSize = VideoSize(it.size.width, it.size.height)
+      val aspectRatio = calculatePiPAspectRatio(videoSize, this.width, this.height, contentFit)
+      applyPiPParams(currentActivity, autoEnterPiP, aspectRatio)
+    }
+    super.onVideoSourceLoaded(player, videoSource, duration, availableVideoTracks, availableSubtitleTracks, availableAudioTracks)
+  }
+
   override fun onTracksChanged(player: VideoPlayer, tracks: Tracks) {
     showsSubtitlesButton = player.subtitles.availableSubtitleTracks.isNotEmpty()
     showsAudioTracksButton = player.audioTracks.availableAudioTracks.size > 1
@@ -302,7 +306,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
         .add(fragment, fragment.id)
         .commitAllowingStateLoss()
     }
-    applyAutoEnterPiP(currentActivity, autoEnterPiP)
+    applyPiPParams(currentActivity, autoEnterPiP)
   }
 
   override fun onDetachedFromWindow() {
@@ -314,7 +318,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
         .remove(fragment)
         .commitAllowingStateLoss()
     }
-    applyAutoEnterPiP(currentActivity, false)
+    applyPiPParams(currentActivity, false)
   }
 
   // After adding the `PlayerView` to the hierarchy the touch events stop being emitted to the JS side.

package/android/src/main/java/expo/modules/video/player/PlayerEvent.kt

@@ -156,7 +156,8 @@ sealed class PlayerEvent {
       is AudioMixingModeChanged -> listeners.forEach { it.onAudioMixingModeChanged(player, audioMixingMode, oldAudioMixingMode) }
       is VideoTrackChanged -> listeners.forEach { it.onVideoTrackChanged(player, videoTrack, oldVideoTrack) }
       is RenderedFirstFrame -> listeners.forEach { it.onRenderedFirstFrame(player) }
-      // JS-only events - VideoSourceLoaded, SubtitleTrackChanged - In the native events the TracksChanged can be used instead
+      is VideoSourceLoaded -> listeners.forEach { it.onVideoSourceLoaded(player, videoSource, duration, availableVideoTracks, availableSubtitleTracks, availableAudioTracks) }
+      // JS-only events - SubtitleTrackChanged - In the native events the TracksChanged can be used instead
       else -> Unit
     }
   }

package/android/src/main/java/expo/modules/video/player/VideoPlayerListener.kt

@@ -6,7 +6,9 @@ import androidx.media3.common.Tracks
 import androidx.media3.common.util.UnstableApi
 import expo.modules.video.enums.AudioMixingMode
 import expo.modules.video.enums.PlayerStatus
+import expo.modules.video.records.AudioTrack
 import expo.modules.video.records.PlaybackError
+import expo.modules.video.records.SubtitleTrack
 import expo.modules.video.records.VideoSource
 import expo.modules.video.records.TimeUpdate
 import expo.modules.video.records.VideoTrack
@@ -25,5 +27,6 @@ interface VideoPlayerListener {
   fun onPlayedToEnd(player: VideoPlayer) {}
   fun onAudioMixingModeChanged(player: VideoPlayer, audioMixingMode: AudioMixingMode, oldAudioMixingMode: AudioMixingMode?) {}
   fun onVideoTrackChanged(player: VideoPlayer, videoTrack: VideoTrack?, oldVideoTrack: VideoTrack?) {}
+  fun onVideoSourceLoaded(player: VideoPlayer, videoSource: VideoSource?, duration: Double?, availableVideoTracks: List<VideoTrack>, availableSubtitleTracks: List<SubtitleTrack>, availableAudioTracks: List<AudioTrack>) {}
   fun onRenderedFirstFrame(player: VideoPlayer) {}
 }

package/android/src/main/java/expo/modules/video/utils/PictureInPictureUtils.kt

@@ -5,11 +5,14 @@ import android.app.PictureInPictureParams
 import android.graphics.Rect
 import android.os.Build
 import android.util.Log
+import android.util.Rational
 import androidx.annotation.OptIn
+import androidx.media3.common.VideoSize
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.ui.PlayerView
 import expo.modules.video.PictureInPictureConfigurationException
 import expo.modules.video.VideoView.Companion.isPictureInPictureSupported
+import expo.modules.video.enums.ContentFit
 
 @OptIn(UnstableApi::class)
 internal fun calculateRectHint(playerView: PlayerView): Rect {
@@ -34,6 +37,25 @@ internal fun calculateRectHint(playerView: PlayerView): Rect {
   return hint
 }
 
+internal fun calculatePiPAspectRatio(videoSize: VideoSize, viewWidth: Int, viewHeight: Int, contentFit: ContentFit): Rational {
+  var aspectRatio = if (contentFit == ContentFit.CONTAIN) {
+    Rational(videoSize.width, videoSize.height)
+  } else {
+    Rational(viewWidth, viewHeight)
+  }
+  // AspectRatio for the activity in picture-in-picture, must be between 2.39:1 and 1:2.39 (inclusive).
+  // https://developer.android.com/reference/android/app/PictureInPictureParams.Builder#setAspectRatio(android.util.Rational)
+  val maximumRatio = Rational(239, 100)
+  val minimumRatio = Rational(100, 239)
+
+  if (aspectRatio.toFloat() > maximumRatio.toFloat()) {
+    aspectRatio = maximumRatio
+  } else if (aspectRatio.toFloat() < minimumRatio.toFloat()) {
+    aspectRatio = minimumRatio
+  }
+  return aspectRatio
+}
+
 internal fun applyRectHint(activity: Activity, rectHint: Rect) {
   if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isPictureInPictureSupported(activity)) {
     runWithPiPMisconfigurationSoftHandling {
@@ -54,10 +76,21 @@ internal fun runWithPiPMisconfigurationSoftHandling(shouldThrow: Boolean = false
   }
 }
 
-internal fun applyAutoEnterPiP(activity: Activity, autoEnterPiP: Boolean) {
-  if (Build.VERSION.SDK_INT >= 31 && isPictureInPictureSupported(activity)) {
+internal fun applyPiPParams(activity: Activity, autoEnterPiP: Boolean, aspectRatio: Rational? = null) {
+  // If the aspect ratio exceeds the limits, the app will crash
+  val safeAspectRatio = aspectRatio?.takeIf { it.toFloat() in 0.41841..2.39 }
+
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isPictureInPictureSupported(activity)) {
+    val paramsBuilder = PictureInPictureParams.Builder()
+
+    safeAspectRatio?.let {
+      paramsBuilder.setAspectRatio(it)
+    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      paramsBuilder.setAutoEnterEnabled(autoEnterPiP)
+    }
     runWithPiPMisconfigurationSoftHandling {
-      activity.setPictureInPictureParams(PictureInPictureParams.Builder().setAutoEnterEnabled(autoEnterPiP).build())
+      activity.setPictureInPictureParams(paramsBuilder.build())
     }
   }
 }

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.2",
       "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.2/expo.modules.video-2.2.2-sources.jar.md5

@@ -0,0 +1 @@
+43232c6b994aa62707fc93444f9c7d67

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.2/expo.modules.video-2.2.2-sources.jar.sha1

@@ -0,0 +1 @@
+a33b4081624352f22acb92aca557d517d8c71230

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.2/expo.modules.video-2.2.2-sources.jar.sha256

@@ -0,0 +1 @@
+c4f2762d81480d94819e4614974b2cc48cdb30dd642f5f41ef6f34cf4c8c62eb

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.2/expo.modules.video-2.2.2-sources.jar.sha512

@@ -0,0 +1 @@
+f975db42b36e2fa2257add07d2578e69d6ae2db1dbcb95ecc5acdc125478a875b8f415f36a864bee021a4876de7b7a5d96998334a8e7261b8a8d70eea3ea3505

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.2/expo.modules.video-2.2.2.aar.md5

@@ -0,0 +1 @@
+db056851da411b8c57e1bf3c003b3998

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.2/expo.modules.video-2.2.2.aar.sha1

@@ -0,0 +1 @@
+94d97f10e11af0fac975db8b790292b45ba217ac

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.2/expo.modules.video-2.2.2.aar.sha256

@@ -0,0 +1 @@
+fc9e3b7f0743af34b778f40a90208e4826b241eb54c4c38e2f0727b2f68cf8a9

package/local-maven-repo/host/exp/exponent/expo.modules.video/2.2.2/expo.modules.video-2.2.2.aar.sha512

@@ -0,0 +1 @@
+0777e51bc9f0d7b489e7a7b84cbf0e24209473fb829158755c276025179e3da1a6d3bdb6a659afe6672776df86142372dd3669759bc9b31fa2896c3f38b242f9

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

@@ -3,7 +3,7 @@
   "component": {
     "group": "host.exp.exponent",
     "module": "expo.modules.video",
-    "version": "2.2.0",
+    "version": "2.2.2",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.video-2.2.0.aar",
-          "url": "expo.modules.video-2.2.0.aar",
-          "size": 444322,
-          "sha512": "a1501f7e947680eba85a049cf0520518bca4feca64832fbdc41383cb2c483f6253ecf8d429ad936966fcce1b0494175035399894dbce9c50f4765bd099edebf1",
-          "sha256": "0022fab08b59c4346e67a4bf573af546f4f0e7eb322aee1115335e035318fa2c",
-          "sha1": "06203802abf1c39df7bef9bddb6cf7dda03e6300",
-          "md5": "b87e04623a8bc68b39b0d628a278460d"
+          "name": "expo.modules.video-2.2.2.aar",
+          "url": "expo.modules.video-2.2.2.aar",
+          "size": 447241,
+          "sha512": "0777e51bc9f0d7b489e7a7b84cbf0e24209473fb829158755c276025179e3da1a6d3bdb6a659afe6672776df86142372dd3669759bc9b31fa2896c3f38b242f9",
+          "sha256": "fc9e3b7f0743af34b778f40a90208e4826b241eb54c4c38e2f0727b2f68cf8a9",
+          "sha1": "94d97f10e11af0fac975db8b790292b45ba217ac",
+          "md5": "db056851da411b8c57e1bf3c003b3998"
         }
       ]
     },
@@ -113,13 +113,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.video-2.2.0.aar",
-          "url": "expo.modules.video-2.2.0.aar",
-          "size": 444322,
-          "sha512": "a1501f7e947680eba85a049cf0520518bca4feca64832fbdc41383cb2c483f6253ecf8d429ad936966fcce1b0494175035399894dbce9c50f4765bd099edebf1",
-          "sha256": "0022fab08b59c4346e67a4bf573af546f4f0e7eb322aee1115335e035318fa2c",
-          "sha1": "06203802abf1c39df7bef9bddb6cf7dda03e6300",
-          "md5": "b87e04623a8bc68b39b0d628a278460d"
+          "name": "expo.modules.video-2.2.2.aar",
+          "url": "expo.modules.video-2.2.2.aar",
+          "size": 447241,
+          "sha512": "0777e51bc9f0d7b489e7a7b84cbf0e24209473fb829158755c276025179e3da1a6d3bdb6a659afe6672776df86142372dd3669759bc9b31fa2896c3f38b242f9",
+          "sha256": "fc9e3b7f0743af34b778f40a90208e4826b241eb54c4c38e2f0727b2f68cf8a9",
+          "sha1": "94d97f10e11af0fac975db8b790292b45ba217ac",
+          "md5": "db056851da411b8c57e1bf3c003b3998"
         }
       ]
     },
@@ -133,13 +133,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.video-2.2.0-sources.jar",
-          "url": "expo.modules.video-2.2.0-sources.jar",
-          "size": 52499,
-          "sha512": "c7c374ab88183e831ed5a80a5e7a6f9ef2d29d4157c7b9496e30a9f87b14c4952b1e867b29f8feedbab21badccdf1b751f3a20367d1970a5e814311d96618f0e",
-          "sha256": "ff54e2221752092ebdece914b77e4504b2864fc94504c8a1887ea67a2afa5ea0",
-          "sha1": "f26b20423aa775f88468456856f576c24bc8149b",
-          "md5": "6e1f79fc8674bec45f35f95a4f8933f3"
+          "name": "expo.modules.video-2.2.2-sources.jar",
+          "url": "expo.modules.video-2.2.2-sources.jar",
+          "size": 53088,
+          "sha512": "f975db42b36e2fa2257add07d2578e69d6ae2db1dbcb95ecc5acdc125478a875b8f415f36a864bee021a4876de7b7a5d96998334a8e7261b8a8d70eea3ea3505",
+          "sha256": "c4f2762d81480d94819e4614974b2cc48cdb30dd642f5f41ef6f34cf4c8c62eb",
+          "sha1": "a33b4081624352f22acb92aca557d517d8c71230",
+          "md5": "43232c6b994aa62707fc93444f9c7d67"
         }
       ]
     }

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

@@ -0,0 +1 @@
+84231c2e30587c39c9aa356d5d61ad5f

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

@@ -0,0 +1 @@
+22a2ccd5ec7569472cb1ffacf4ce48b388f113b9

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

@@ -0,0 +1 @@
+9417376d37c0968b5f7afcea49068ba156ac752fe1ef6b0e6608d6c83774ad7d

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

@@ -0,0 +1 @@
+0aaeb765ff81d10522b0df7f4a1f5c11e02d69262cba0df0b4a7fb9592f2888f9dca31f1d320732d8ba4fbba248937d6326203a2c75540157b6d42acfb96c533

package/local-maven-repo/host/exp/exponent/expo.modules.video/{2.2.0/expo.modules.video-2.2.0.pom → 2.2.2/expo.modules.video-2.2.2.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.2</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.2/expo.modules.video-2.2.2.pom.md5

@@ -0,0 +1 @@
+117d2dfccc5a53d84f187142206733a2

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

@@ -0,0 +1 @@
+d84503d8120e53ed771a44573972ce64411a5721

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

@@ -0,0 +1 @@
+5fd3113c3aa0268a60a477b588d13c9811af98d5bcc586b5fc14c362a2339092

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

@@ -0,0 +1 @@
+8fbd1782ccfad3d3525982111eeb4b12e3422ac7bfcdfd65af22956bdce3f701ce8106fef0ccbb1a2662a15f34c5e53adac651f27af2c585821ce8be95569626

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.2</latest>
+    <release>2.2.2</release>
     <versions>
-      <version>2.2.0</version>
+      <version>2.2.2</version>
     </versions>
-    <lastUpdated>20250604230414</lastUpdated>
+    <lastUpdated>20250618190640</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-d7576712c099005e0070a39cce656ca6
+0e0fc95abac512b09e257bd8d6c5dcdc

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

@@ -1 +1 @@
-52a901eebefa6fac0c034b76185f5386b9113588
+cc6831afd35541a75752566714965d906c92307f

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

@@ -1 +1 @@
-28ab1754acdffea060d818f3e54d1bfc0823de6c803276cf828c4371524eb793
+9816759f48af1f8c7d137b94f0716e987c4996b317449711a43a9e968a18adec

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

@@ -1 +1 @@
-1eb28fa579897d17888ae6f4f6dc0f996daf6c967f6dba0e239386c00c42e399b4dce3b2a8274364679e4c562ccd3b619c4e3271b0a4ed695c29b5097711c710
+f460c7210f64dab2879bbac8eaad1114c0ffc9ccad58aaea8968b3184639fbad547042e33377e797ae1126068821c2b6b49bd49aedcf850156d3ee507f725764

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-video",
   "title": "Expo Video",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "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": "cc3b641cc2e4e7686dca75e7029cf76a07b3d647"
 }

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

@@ -1 +0,0 @@
-6e1f79fc8674bec45f35f95a4f8933f3

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

@@ -1 +0,0 @@
-f26b20423aa775f88468456856f576c24bc8149b

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

@@ -1 +0,0 @@
-ff54e2221752092ebdece914b77e4504b2864fc94504c8a1887ea67a2afa5ea0

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

@@ -1 +0,0 @@
-c7c374ab88183e831ed5a80a5e7a6f9ef2d29d4157c7b9496e30a9f87b14c4952b1e867b29f8feedbab21badccdf1b751f3a20367d1970a5e814311d96618f0e

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

@@ -1 +0,0 @@
-b87e04623a8bc68b39b0d628a278460d

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

@@ -1 +0,0 @@
-06203802abf1c39df7bef9bddb6cf7dda03e6300

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

@@ -1 +0,0 @@
-0022fab08b59c4346e67a4bf573af546f4f0e7eb322aee1115335e035318fa2c

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

@@ -1 +0,0 @@
-a1501f7e947680eba85a049cf0520518bca4feca64832fbdc41383cb2c483f6253ecf8d429ad936966fcce1b0494175035399894dbce9c50f4765bd099edebf1

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