fix: throw Java exception instead of exit(1) on fatal errors

Replace die() → exit(1) with die() → ThrowNew(RuntimeException) so that
mpv initialization failures are reported as catchable Java exceptions
instead of killing the entire Android process.

All call sites now return after die() since ThrowNew only sets a pending
exception flag without unwinding the stack.

Author: edde746

libmpv/src/main/cpp/event.cpp

@@ -69,8 +69,10 @@ static void sendLogMessageToJava(JNIEnv *env, mpv_event_log_message *msg) {
 void *event_thread(void *arg) {
     JNIEnv *env = NULL;
     acquire_jni_env(g_vm, &env);
-    if (!env)
-        die("failed to acquire java env");
+    if (!env) {
+        ALOGE("failed to acquire java env");
+        return NULL;
+    }
 
     while (true) {
         mpv_event *mp_event;

libmpv/src/main/cpp/globals.h

@@ -1,6 +1,8 @@
 #pragma once
 
+#include <jni.h>
 #include <atomic>
+#include <mpv/client.h>
 
 extern JavaVM *g_vm;
 extern mpv_handle *g_mpv;

libmpv/src/main/cpp/log.cpp

@@ -1,9 +1,13 @@
 #include "log.h"
-
-#include <cstdlib>
+#include "globals.h"
+#include "jni_utils.h"
 
 void die(const char *msg)
 {
     ALOGE("%s", msg);
-    exit(1);
+    JNIEnv *env = nullptr;
+    if (g_vm && acquire_jni_env(g_vm, &env) && env) {
+        jclass cls = env->FindClass("java/lang/RuntimeException");
+        if (cls) env->ThrowNew(cls, msg);
+    }
 }

libmpv/src/main/cpp/log.h

@@ -12,9 +12,16 @@
 #define ALOGV(...) (void)0
 #endif
 
-__attribute__((noreturn)) void die(const char *msg);
+void die(const char *msg);
 
 #define CHECK_MPV_INIT() do { \
-	if (__builtin_expect(!g_mpv, 0)) \
+	if (__builtin_expect(!g_mpv, 0)) { \
         die("libmpv is not initialized"); \
-	} while (0)
+        return; \
+	} } while (0)
+
+#define CHECK_MPV_INIT_RET(val) do { \
+	if (__builtin_expect(!g_mpv, 0)) { \
+        die("libmpv is not initialized"); \
+        return val; \
+	} } while (0)

libmpv/src/main/cpp/main.cpp

@@ -49,26 +49,36 @@ static void prepare_environment(JNIEnv *env, jobject appctx) {
 jni_func(void, create, jobject appctx) {
     prepare_environment(env, appctx);
 
-    if (g_mpv)
+    if (g_mpv) {
         die("mpv is already initialized");
+        return;
+    }
 
     g_mpv = mpv_create();
-    if (!g_mpv)
+    if (!g_mpv) {
         die("context init failed");
+        return;
+    }
 
     mpv_request_log_messages(g_mpv, "v");
 }
 
 jni_func(void, init) {
-    if (!g_mpv)
+    if (!g_mpv) {
         die("mpv is not created");
+        return;
+    }
 
-    if (mpv_initialize(g_mpv) < 0)
+    if (mpv_initialize(g_mpv) < 0) {
         die("mpv init failed");
+        return;
+    }
 
     g_event_thread_request_exit = false;
-    if (pthread_create(&event_thread_id, NULL, event_thread, NULL) != 0)
+    if (pthread_create(&event_thread_id, NULL, event_thread, NULL) != 0) {
         die("thread create failed");
+        return;
+    }
     pthread_setname_np(event_thread_id, "event_thread");
 }
 
@@ -92,8 +102,10 @@ jni_func(void, command, jobjectArray jarray) {
 
     const char *arguments[128] = { 0 };
     int len = env->GetArrayLength(jarray);
-    if (len >= ARRAYLEN(arguments))
+    if (len >= ARRAYLEN(arguments)) {
         die("too many command arguments");
+        return;
+    }
 
     for (int i = 0; i < len; ++i)
         arguments[i] = env->GetStringUTFChars((jstring)env->GetObjectArrayElement(jarray, i), NULL);

libmpv/src/main/cpp/property.cpp

@@ -23,7 +23,7 @@ extern "C" {
 }
 
 jni_func(jint, setOptionString, jstring joption, jstring jvalue) {
-    CHECK_MPV_INIT();
+    CHECK_MPV_INIT_RET(0);
 
     const char *option = env->GetStringUTFChars(joption, NULL);
     const char *value = env->GetStringUTFChars(jvalue, NULL);
@@ -37,7 +37,7 @@ jni_func(jint, setOptionString, jstring joption, jstring jvalue) {
 }
 
 static int common_get_property(JNIEnv *env, jstring jproperty, mpv_format format, void *output) {
-    CHECK_MPV_INIT();
+    CHECK_MPV_INIT_RET(-1);
 
     const char *prop = env->GetStringUTFChars(jproperty, NULL);
     int result = mpv_get_property(g_mpv, prop, format, output);
@@ -49,7 +49,7 @@ static int common_get_property(JNIEnv *env, jstring jproperty, mpv_format format
 }
 
 static int common_set_property(JNIEnv *env, jstring jproperty, mpv_format format, void *value) {
-    CHECK_MPV_INIT();
+    CHECK_MPV_INIT_RET(-1);
 
     const char *prop = env->GetStringUTFChars(jproperty, NULL);
     int result = mpv_set_property(g_mpv, prop, format, value);

libmpv/src/main/cpp/render.cpp

@@ -17,8 +17,10 @@ jni_func(void, attachSurface, jobject surface_) {
     CHECK_MPV_INIT();
 
     surface = env->NewGlobalRef(surface_);
-    if (!surface)
+    if (!surface) {
         die("invalid surface provided");
+        return;
+    }
     int64_t wid = reinterpret_cast<intptr_t>(surface);
     int result = mpv_set_option(g_mpv, "wid", MPV_FORMAT_INT64, &wid);
     if (result < 0)