chore: use new compose-gl api

Author: silenium-dev

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ kotlinx-serialization = "1.7.3"
 kotlinx-datetime = "0.6.1"
 
 compose = "1.7.0-rc01"
-compose-gl = "0.6.1"
+compose-gl = "0.7.0"
 jni-utils = "0.1.5"
 skiko = "0.8.15-egl"
 jna = "5.15.0"

src/main/kotlin/dev/silenium/multimedia/compose/player/VideoPlayer.kt

@@ -3,6 +3,7 @@ package dev.silenium.multimedia.compose.player
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import dev.silenium.compose.gl.surface.GLDrawScope
+import dev.silenium.compose.gl.surface.GLSurface
 import dev.silenium.compose.gl.surface.GLSurfaceState
 import dev.silenium.multimedia.compose.util.deferredFlowStateOf
 import dev.silenium.multimedia.compose.util.mapState
@@ -13,6 +14,7 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 class VideoPlayer(hwdec: Boolean = false) : AutoCloseable {
+    internal var surface: GLSurface? = null
     private var initialized = false
 
     @PublishedApi

src/main/kotlin/dev/silenium/multimedia/compose/player/VideoSurface.kt

@@ -1,7 +1,6 @@
 package dev.silenium.multimedia.compose.player
 
 import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.MaterialTheme
@@ -10,48 +9,55 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import dev.silenium.compose.gl.surface.FBOSizeOverride
-import dev.silenium.compose.gl.surface.GLSurfaceView
-import dev.silenium.compose.gl.surface.rememberGLSurfaceState
+import dev.silenium.compose.gl.surface.*
 import dev.silenium.multimedia.core.annotation.InternalMultimediaApi
 
 @Composable
-fun VideoSurface(
+private fun createGLSurface(
     player: VideoPlayer,
-    showStats: Boolean = false,
-    modifier: Modifier = Modifier,
+    surfaceState: GLSurfaceState = rememberGLSurfaceState(),
     onInitialized: () -> Unit = {},
-) {
-    val surfaceState = rememberGLSurfaceState()
+): GLSurface {
+    var initialized by remember { mutableStateOf(false) }
 
     @OptIn(InternalMultimediaApi::class)
-    val dwidth by player.property<Long>("width")
+    val dwidth by player.property<Long>("dwidth")
 
     @OptIn(InternalMultimediaApi::class)
-    val dheight by player.property<Long>("height")
+    val dheight by player.property<Long>("dheight")
     val fboSizeOverride = remember(dwidth, dheight) {
         dwidth?.let { w ->
             dheight?.let { h ->
                 FBOSizeOverride(w.toInt(), h.toInt())
             }
         }
     }
+    return rememberGLSurface(
+        surfaceState,
+        presentMode = GLSurface.PresentMode.MAILBOX,
+        swapChainSize = 3,
+        fboSizeOverride = fboSizeOverride,
+        draw = {
+            player.onRender(this, surfaceState)
+            if (!initialized) {
+                initialized = true
+                onInitialized()
+            }
+        }
+    )
+}
 
+@Composable
+fun VideoSurface(
+    player: VideoPlayer,
+    showStats: Boolean = false,
+    modifier: Modifier = Modifier,
+) {
+    val surfaceState = rememberGLSurfaceState()
     BoxWithConstraints(modifier = modifier) {
-        var initialized by remember { mutableStateOf(false) }
         GLSurfaceView(
-            surfaceState,
-            modifier = Modifier.fillMaxSize(),
-            presentMode = GLSurfaceView.PresentMode.MAILBOX,
-            swapChainSize = 3,
-            draw = {
-                player.onRender(this, surfaceState)
-                if (!initialized) {
-                    initialized = true
-                    onInitialized()
-                }
-            },
-            fboSizeOverride = fboSizeOverride,
+            surface = player.surface ?: createGLSurface(player, surfaceState),
+            modifier = Modifier.matchParentSize(),
         )
         if (showStats) {
             Surface(
@@ -66,8 +72,16 @@ fun VideoSurface(
 }
 
 @Composable
-fun rememberVideoPlayer(): VideoPlayer {
+fun rememberVideoPlayer(
+    surfaceState: GLSurfaceState = rememberGLSurfaceState(),
+    onInitialized: () -> Unit = {},
+): VideoPlayer {
     val player = remember { VideoPlayer() }
+    val surface = createGLSurface(player, surfaceState, onInitialized)
+
+    LaunchedEffect(player, surface) {
+        player.surface = surface
+    }
     DisposableEffect(player) {
         onDispose {
             player.close()