Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Fix TextureView render handoff

David Nashash27e095f014be
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
index 1a5b631a..8fab561e 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerViewModel.kt
@@ -1062,8 +1062,6 @@ class PlayerViewModel @Inject constructor(
val adoptedEngine = session.engine
return runCatching {
- // Detach the Home preview surface before Player binds its own.
- adoptedEngine.clearRenderBinding()
// Media3 requires a globally unique session ID. Release the main engine's
// session before the adopted live engine enables its own replacement.
mainPlayerEngine.setMediaSessionEnabled(false)
@@ -1090,10 +1088,11 @@ class PlayerViewModel @Inject constructor(
)
// Re-prime the adopted engine against the fullscreen surface path.
// Preview-to-fullscreen handoff can temporarily leave the reused live
- // player with an audio-only pipeline until the new render view binds.
- // Refreshing the current live media source makes the handoff more
- // robust without re-resolving provider URLs or abandoning the adopted
- // engine instance.
+ // player with a stale render target if the old view is detached before
+ // the new one attaches. The shared binder now switches PlayerViews in
+ // Media3's recommended order, and refreshing the live media source keeps
+ // the adopted engine synced to the fullscreen render path without
+ // re-resolving provider URLs or abandoning the engine instance.
playerEngine.renewStreamUrl(session.streamInfo)
playerEngine.play()
startTokenRenewalMonitoring(session.streamInfo.expirationTime)
diff --git a/player/src/main/java/com/streamvault/player/ui/PlayerViewBinder.kt b/player/src/main/java/com/streamvault/player/ui/PlayerViewBinder.kt
index 3e6c556b..2d43ffc4 100644
--- a/player/src/main/java/com/streamvault/player/ui/PlayerViewBinder.kt
+++ b/player/src/main/java/com/streamvault/player/ui/PlayerViewBinder.kt
@@ -36,8 +36,7 @@ class PlayerViewBinder(
val playerView = renderView as? PlayerView ?: return
boundResizeMode = resizeMode
if (boundPlayerView !== playerView) {
- boundPlayerView?.player = null
- playerView.player = player
+ PlayerView.switchTargetView(player, boundPlayerView, playerView)
boundPlayerView = playerView
} else if (playerView.player !== player) {
playerView.player = player
diff --git a/player/src/main/res/layout/player_texture_view.xml b/player/src/main/res/layout/player_texture_view.xml
index 45a24a8d..97ffeb6d 100644
--- a/player/src/main/res/layout/player_texture_view.xml
+++ b/player/src/main/res/layout/player_texture_view.xml
@@ -6,5 +6,5 @@
android:layout_height="match_parent"
app:surface_type="texture_view"
app:use_controller="false"
- app:keep_content_on_player_reset="true"
+ app:keep_content_on_player_reset="false"
app:show_buffering="never" />