expo-video 3.1.0-canary-20251216-3f01dbf → 3.1.0-canary-20251223-b83b31e

package/CHANGELOG.md

@@ -16,6 +16,7 @@
 - [Android] Fix media controls (e.g. bluetooth) not working when `ExpoVideoPlaybackService` is not registered. ([#40728](https://github.com/expo/expo/pull/40728) by [@behenate](https://github.com/behenate))
 - [Web] Fix crash on older versions of Safari. ([#41101](https://github.com/expo/expo/pull/41101) by [@CamWass](https://github.com/CamWass))
 - [Web] Fix video pausing when entering fullscreen in electron apps. ([#40989](https://github.com/expo/expo/pull/40989) by [@behenate](https://github.com/behenate))
+- [Android] Fix crashes when exiting PiP with one than more `VideoView` present on the screen. ([#41090](https://github.com/expo/expo/pull/41090) by [@behenate](https://github.com/behenate))
 
 ### 💡 Others
 

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '3.1.0-canary-20251216-3f01dbf'
+version = '3.1.0-canary-20251223-b83b31e'
 
 android {
   namespace "expo.modules.video"
   defaultConfig {
     versionCode 1
-    versionName '3.1.0-canary-20251216-3f01dbf'
+    versionName '3.1.0-canary-20251223-b83b31e'
   }
 }
 

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

@@ -22,6 +22,7 @@ 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.managers.VideoManager
 
 @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
 class FullscreenPlayerActivity : Activity() {

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

@@ -9,6 +9,7 @@ import androidx.media3.database.StandaloneDatabaseProvider
 import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import expo.modules.kotlin.exception.Exceptions
+import expo.modules.video.managers.VideoManager
 import java.io.File
 import java.lang.ref.WeakReference
 import java.util.UUID

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

@@ -27,6 +27,7 @@ import expo.modules.video.records.SeekTolerance
 import expo.modules.video.records.VideoSource
 import expo.modules.video.records.VideoThumbnailOptions
 import expo.modules.video.utils.runWithPiPMisconfigurationSoftHandling
+import expo.modules.video.managers.VideoManager
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
@@ -43,6 +44,10 @@ class VideoModule : Module() {
       VideoManager.onModuleCreated(appContext)
     }
 
+    OnDestroy {
+      VideoManager.onModuleDestroyed(appContext)
+    }
+
     Function("isPictureInPictureSupported") {
       VideoView.isPictureInPictureSupported(appContext.throwingActivity)
     }
@@ -396,8 +401,8 @@ private inline fun <reified T : VideoView> ViewDefinitionBuilder<T>.VideoViewCom
   Prop("contentFit") { view: T, contentFit: ContentFit ->
     view.contentFit = contentFit
   }
-  Prop("startsPictureInPictureAutomatically") { view: T, autoEnterPiP: Boolean ->
-    view.autoEnterPiP = autoEnterPiP
+  Prop("startsPictureInPictureAutomatically") { view: T, autoEnterPiP: Boolean? ->
+    view.autoEnterPiP = autoEnterPiP ?: false
   }
   Prop("allowsFullscreen") { view: T, allowsFullscreen: Boolean? ->
     view.allowsFullscreen = allowsFullscreen ?: true

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

@@ -1,22 +1,17 @@
 package expo.modules.video
 
 import android.app.Activity
-import android.app.PictureInPictureParams
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.os.Build
-import android.util.Rational
 import android.view.accessibility.CaptioningManager
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-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
@@ -28,18 +23,20 @@ import expo.modules.kotlin.views.ExpoView
 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.listeners.VideoPlayerListener
+import expo.modules.video.listeners.VideoViewListener
 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.records.FullscreenOptions
 import expo.modules.video.utils.SubtitleUtils
-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 expo.modules.video.managers.VideoManager
+import expo.modules.video.managers.calculateCurrentPipAspectRatio
+import expo.modules.video.records.PiPParams
+import expo.modules.video.utils.calculateRectHint
+import java.lang.ref.WeakReference
 import java.util.UUID
 
 class SurfaceVideoView(context: Context, appContext: AppContext) : VideoView(context, appContext)
@@ -55,8 +52,6 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
   val onFullscreenExit by EventDispatcher<Unit>()
   val onFirstFrameRender by EventDispatcher<Unit>()
 
-  var willEnterPiP: Boolean = false
-
   // In some situations we can't detect if the view will enter PiP, in that case the playback will be paused
   // We can get an event after PiP has started, that's when we should resume playback
   var wasAutoPaused: Boolean = false
@@ -67,13 +62,10 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
   var showsAudioTracksButton = false
     private set
 
+  private var listeners = mutableListOf<WeakReference<VideoViewListener>>()
   private val currentActivity = appContext.throwingActivity
   private val decorView = currentActivity.window.decorView
-  private val rootView = decorView.findViewById<ViewGroup>(android.R.id.content)
   private val touchEventCoalescingKeyHelper = TouchEventCoalescingKeyHelper()
-
-  private val rootViewChildrenOriginalVisibility: ArrayList<Int> = arrayListOf()
-  private var pictureInPictureHelperTag: String? = null
   private var reactNativeEventDispatcher: EventDispatcher? = null
   private var captioningChangeListener: CaptioningManager.CaptioningChangeListener? = null
 
@@ -84,6 +76,13 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     }
   }
 
+  var pipParams by IgnoreSameSet(PiPParams()) { new, old ->
+    listeners.forEach {
+      it.get()?.onPiPParamsChanged(this, old, new)
+    }
+  }
+    private set
+
   // We need to keep track of the target surface view visibility, but only apply it when `useExoShutter` is false.
   var shouldHideSurfaceView: Boolean = true
 
@@ -99,7 +98,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     }
 
   var autoEnterPiP: Boolean by IgnoreSameSet(false) { new, _ ->
-    applyPiPParams(currentActivity, new, calculateCurrentPipAspectRatio())
+    pipParams = pipParams.copy(autoEnter = new)
   }
 
   var contentFit: ContentFit = ContentFit.CONTAIN
@@ -217,7 +216,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
       currentActivity.overridePendingTransition(0, 0)
     }
     onFullscreenEnter(Unit)
-    applyPiPParams(currentActivity, false, calculateCurrentPipAspectRatio())
+    pipParams = pipParams.copy(blocksAppFromEntering = true)
   }
 
   fun attachPlayer() {
@@ -231,7 +230,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     attachPlayer()
     onFullscreenExit(Unit)
     isInFullscreen = false
-    applyPiPParams(currentActivity, autoEnterPiP, calculateCurrentPipAspectRatio())
+    pipParams = pipParams.copy(blocksAppFromEntering = false)
   }
 
   fun enterPictureInPicture() {
@@ -239,49 +238,38 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
       throw PictureInPictureUnsupportedException()
     }
 
-    val player = playerView.player
-      ?: throw PictureInPictureEnterException("No player attached to the VideoView")
-    playerView.useController = false
-    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) {
-      @Suppress("DEPRECATION")
-      currentActivity.enterPictureInPictureMode()
+    if (playerView.player == null) {
+      throw PictureInPictureEnterException("No player attached to the VideoView")
     }
+
+    pipParams = pipParams.copy(willEnter = true)
+    VideoManager.pictureInPicture.enterPictureInPicture(this)
   }
 
-  private fun calculateCurrentPipAspectRatio(): Rational? {
-    val player = videoPlayer?.player ?: return null
-    return calculatePiPAspectRatio(player.videoSize, this.width, this.height, contentFit)
+  /**
+   * @param pipCandidate - VideoView that was elected to be displayed in PiP
+   */
+  fun onStartPictureInPicture(pipCandidate: VideoView?) {
+    onPictureInPictureStart(Unit)
   }
 
   /**
-   * 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.
+   * @param pipCandidate - VideoView that was being displayed in PiP
    */
-  fun layoutForPiPEnter() {
-    playerView.useController = false
-    (playerView.parent as? ViewGroup)?.removeView(playerView)
-    for (i in 0 until rootView.childCount) {
-      if (rootView.getChildAt(i) != playerView) {
-        rootViewChildrenOriginalVisibility.add(rootView.getChildAt(i).visibility)
-        rootView.getChildAt(i).visibility = View.GONE
-      }
-    }
-    rootView.addView(playerView, FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
+  fun onStopPictureInPicture(pipCandidate: VideoView?) {
+    pipParams = pipParams.copy(willEnter = false)
+    onPictureInPictureStop(Unit)
   }
 
-  fun layoutForPiPExit() {
-    playerView.useController = useNativeControls
-    rootView.removeView(playerView)
-    for (i in 0 until rootView.childCount) {
-      rootView.getChildAt(i).visibility = rootViewChildrenOriginalVisibility[i]
+  fun addVideoViewListener(listener: VideoViewListener) {
+    if (listeners.any { it.get() == listener }) {
+      return
     }
-    rootViewChildrenOriginalVisibility.clear()
-    this.addView(playerView)
+    listeners.add(WeakReference(listener))
+  }
+
+  fun removeVideoViewListener(listener: VideoViewListener) {
+    listeners.retainAll { it.get() != listener }
   }
 
   override fun onVideoSourceLoaded(
@@ -292,14 +280,16 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     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)
-    }
+    pipParams = pipParams.copy(aspectRatio = calculateCurrentPipAspectRatio())
     super.onVideoSourceLoaded(player, videoSource, duration, availableVideoTracks, availableSubtitleTracks, availableAudioTracks)
   }
 
+  override fun onIsPlayingChanged(player: VideoPlayer, isPlaying: Boolean, oldIsPlaying: Boolean?) {
+    if (player == videoPlayer && isPlaying) {
+      wasAutoPaused = false
+    }
+  }
+
   override fun onTracksChanged(player: VideoPlayer, tracks: Tracks) {
     showsSubtitlesButton = player.subtitles.availableSubtitleTracks.isNotEmpty()
     showsAudioTracksButton = player.audioTracks.availableAudioTracks.size > 1
@@ -328,19 +318,13 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     super.onLayout(changed, l, t, r, b)
     // On every re-layout ExoPlayer resets the timeBar to be enabled.
     // We need to disable it to keep scrubbing impossible.
+
+    pipParams = pipParams.copy(rectHint = calculateRectHint(playerView))
     playerView.setTimeBarInteractive(videoPlayer?.requiresLinearPlayback ?: true)
-    applyRectHint(currentActivity, calculateRectHint(playerView))
   }
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
-    (currentActivity as? FragmentActivity)?.let {
-      val fragment = PictureInPictureHelperFragment(this)
-      pictureInPictureHelperTag = fragment.id
-      it.supportFragmentManager.beginTransaction()
-        .add(fragment, fragment.id)
-        .commitAllowingStateLoss()
-    }
 
     // Set up listener for accessibility caption changes when attached to window
     setupCaptioningChangeListener()
@@ -350,7 +334,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     // Set up window focus change listener
     decorView.onFocusChangeListener = windowFocusChangeListener
 
-    applyPiPParams(currentActivity, autoEnterPiP)
+    pipParams = pipParams.copy(canEnter = true)
   }
 
   override fun onVisibilityChanged(changedView: View, visibility: Int) {
@@ -363,13 +347,6 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    (currentActivity as? FragmentActivity)?.let {
-      val fragment = it.supportFragmentManager.findFragmentByTag(pictureInPictureHelperTag ?: "")
-        ?: return
-      it.supportFragmentManager.beginTransaction()
-        .remove(fragment)
-        .commitAllowingStateLoss()
-    }
 
     // Clean up captioning change listener
     captioningChangeListener?.let {
@@ -381,7 +358,7 @@ open class VideoView(context: Context, appContext: AppContext, useTextureView: B
     // Clean up window focus listener
     decorView.onFocusChangeListener = null
 
-    applyPiPParams(currentActivity, false)
+    pipParams = pipParams.copy(canEnter = 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/delegates/IgnoreSameSet.kt

@@ -16,7 +16,7 @@ class IgnoreSameSet<T : Any?>(private var value: T, val propertyMapper: ((T) ->
   }
 
   operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
-    if (this.value == propertyMapper(value)) return
+    if (this.value?.equals(propertyMapper(value)) ?: false) return
     val oldValue = this.value
     this.value = propertyMapper(value)
     didSet?.invoke(this.value, oldValue)

package/android/src/main/java/expo/modules/video/listeners/VideoManagerListener.kt

@@ -0,0 +1,10 @@
+package expo.modules.video.listeners
+
+import expo.modules.video.VideoView
+
+interface VideoManagerListener {
+  fun onVideoViewRegistered(videoView: VideoView, allVideoViews: Collection<VideoView>) {}
+  fun onVideoViewUnregistered(videoView: VideoView, allVideoViews: Collection<VideoView>) {}
+  fun onAppBackgrounded() {}
+  fun onAppForegrounded() {}
+}

package/android/src/main/java/expo/modules/video/{player → listeners}/VideoPlayerListener.kt

@@ -1,4 +1,4 @@
-package expo.modules.video.player
+package expo.modules.video.listeners
 
 import androidx.annotation.OptIn
 import androidx.media3.common.TrackSelectionParameters
@@ -7,11 +7,12 @@ import androidx.media3.common.util.UnstableApi
 import expo.modules.video.VideoView
 import expo.modules.video.enums.AudioMixingMode
 import expo.modules.video.enums.PlayerStatus
+import expo.modules.video.player.VideoPlayer
 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.VideoSource
 import expo.modules.video.records.VideoTrack
 
 @OptIn(UnstableApi::class)

package/android/src/main/java/expo/modules/video/listeners/VideoViewListener.kt

@@ -0,0 +1,13 @@
+package expo.modules.video.listeners
+
+import expo.modules.video.VideoView
+import expo.modules.video.records.PiPParams
+
+interface VideoViewListener {
+  /**
+   * Called when the ability of the view to autoEnterPip has changed.
+   * Note: This can be called when `autoEnterPiP` doesn't change, but other factors
+   * influence the view's ability to enter PiP.
+   */
+  fun onPiPParamsChanged(videoView: VideoView, oldPiPParams: PiPParams, newPiPParams: PiPParams) = Unit
+}

package/android/src/main/java/expo/modules/video/{AudioFocusManager.kt → managers/AudioFocusManager.kt}

@@ -1,4 +1,4 @@
-package expo.modules.video
+package expo.modules.video.managers
 
 import android.content.Context
 import android.media.AudioAttributes
@@ -7,9 +7,10 @@ import android.media.AudioManager
 import android.os.Build
 import androidx.media3.common.util.UnstableApi
 import expo.modules.kotlin.AppContext
+import expo.modules.video.FailedToGetAudioFocusManagerException
 import expo.modules.video.enums.AudioMixingMode
 import expo.modules.video.player.VideoPlayer
-import expo.modules.video.player.VideoPlayerListener
+import expo.modules.video.listeners.VideoPlayerListener
 import kotlinx.coroutines.launch
 import java.lang.ref.WeakReference