chore: minor cleanup

Author: silenium-dev

native/src/cpp/mpv/MPV.cpp

@@ -580,20 +580,22 @@ JNIEXPORT jobject JNICALL Java_dev_silenium_multimedia_core_mpv_MPVKt_createRend
     }
     const auto object = env->NewGlobalRef(self);
 
-    const auto glProcMethod = env->GetMethodID(env->GetObjectClass(self), "getGlProc", "(Ljava/lang/String;)J");
-    if (glProcMethod == nullptr) {
-        std::cerr << "Method not found: getGlProc" << std::endl;
-        return mpvResultFailure(env, "GetMethodID", MPV_ERROR_GENERIC);
-    }
     mpv_opengl_init_params gl_params{
-            .get_proc_address = fnptr<void *(void *, const char *)>([=](void *ctx, const char *name) -> void * {
+            .get_proc_address = fnptr<void *(void *, const char *)>([object, jvm](void *ctx, const char *name) -> void * {
                 JNIEnv *jni_env;
                 const auto res = jvm->AttachCurrentThread(reinterpret_cast<void **>(&jni_env), nullptr);
                 if (res != JNI_OK) {
                     std::cerr << "Failed to attach current thread" << std::endl;
                     return nullptr;
                 }
 
+                // TODO: Fix crash here during renderer disposal
+                const auto glProcMethod = jni_env->GetMethodID(jni_env->GetObjectClass(object), "getGlProc", "(Ljava/lang/String;)J");
+                if (glProcMethod == nullptr) {
+                    std::cerr << "Method not found: getGlProc" << std::endl;
+                    return nullptr;
+                }
+
                 const auto nameStr = jni_env->NewStringUTF(name);
                 const auto ret = jni_env->CallLongMethod(object, glProcMethod, nameStr);
                 jni_env->DeleteLocalRef(nameStr);
@@ -609,22 +611,24 @@ JNIEXPORT jobject JNICALL Java_dev_silenium_multimedia_core_mpv_MPVKt_createRend
 
     mpv_render_context *handle{nullptr};
     if (const auto ret = mpv_render_context_create(&handle, reinterpret_cast<mpv_handle *>(mpvHandle), params.data()); ret < 0) {
+        env->DeleteGlobalRef(object);
         return mpvResultFailure(env, "mpv_render_context_create", ret);
     }
-    const auto updateMethod = env->GetMethodID(env->GetObjectClass(self), "requestUpdate", "()V");
-    if (updateMethod == nullptr) {
-        std::cerr << "Method not found: requestUpdate" << std::endl;
-        return mpvResultFailure(env, "GetMethodID", MPV_ERROR_GENERIC);
-    }
     mpv_render_context_set_update_callback(
             handle,
-            fnptr<void(void *)>([=](void *) {
+            fnptr<void(void *)>([object, jvm](void *) {
                 JNIEnv *jni_env;
                 const auto res = jvm->AttachCurrentThread(reinterpret_cast<void **>(&jni_env), nullptr);
                 if (res != JNI_OK) {
                     std::cerr << "Failed to attach current thread" << std::endl;
                     return;
                 }
+                const auto updateMethod = jni_env->GetMethodID(jni_env->GetObjectClass(object), "requestUpdate", "()V");
+                if (updateMethod == nullptr) {
+                    std::cerr << "Method not found: requestUpdate" << std::endl;
+                    return;
+                }
+                std::cerr << "Requesting update: " << object << ", " << updateMethod << std::endl;
                 jni_env->CallVoidMethod(object, updateMethod);
                 jvm->DetachCurrentThread();
             }),

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

@@ -56,7 +56,7 @@ fun VideoSurface(
     val surfaceState = rememberGLSurfaceState()
     BoxWithConstraints(modifier = modifier) {
         GLSurfaceView(
-            surface = player.surface ?: createGLSurface(player, surfaceState),
+            surface = player.surface!!,
             modifier = Modifier.matchParentSize(),
         )
         if (showStats) {
@@ -79,11 +79,10 @@ fun rememberVideoPlayer(
     val player = remember { VideoPlayer() }
     val surface = createGLSurface(player, surfaceState, onInitialized)
 
-    LaunchedEffect(player, surface) {
+    DisposableEffect(player, surface) {
         player.surface = surface
-    }
-    DisposableEffect(player) {
         onDispose {
+            player.surface = null
             player.close()
         }
     }

src/main/kotlin/dev/silenium/multimedia/core/mpv/MPV.kt

@@ -324,7 +324,7 @@ class MPV : NativeCleanable, MPVAsyncListener {
             }
             commandAsyncN(nativePointer.address, command, subscriptionId).onFailure {
                 commandReplyCallbacks.remove(subscriptionId)
-                logger.error("Failed to execute command $command", it)
+                logger.error("Failed to execute command ${command.joinToString()}", it)
                 continuation.resume(Result.failure(it))
             }
         }