build: switch every platform's libmpv supply chain to the unified mpv-build repo

Plezy consumed mpv through four unrelated supply chains: an MPVKit fork via SwiftPM for the Apple platforms, a libmpv-android fork's AAR for Android, an in-CI from-source build for Linux, and an unpinned sourceforge mpv-dev 7z for Windows. All four now consume the same per-commit, content-addressed binaries from https://github.com/edde746/mpv-build, pinned to one commit and built from one set of pinned sources (mpv v0.41.0 on Apple/Android/Windows, ffmpeg n8.0.1, our libass fork). - Apple: the SwiftPM package moves from edde746/MPVKit to edde746/mpv-build across the ios/macos/tvos projects; scripts/set_mpvkit_revision.sh becomes set_native_revision.sh, writes every pin site plus the new repo-root mpv-build.lock.json, and tvos/scripts/wire_mpv.rb derives the package repo from the locks. - Android: the mpv Kotlin API and JNI glue move in-app under android/libmpv (repackaged com.edde746.plezy.libmpv, exports renamed, shrinker rules covered), and the module downloads per-ABI native tarballs (lib/*.so incl. libc++_shared.so + include/) driven entirely by mpv-build.lock.json, with a PLEZY_LOCAL_MPV_DIR escape hatch for locally built artifacts. The fork AAR and its Maven coordinates are gone. - Linux: CI downloads the prebuilt self-relocating libmpv prefix (lock-driven, sha256-verified) instead of compiling mpv/ffmpeg/dav1d/ libplacebo/shaderc from source; linux/packaging/build-libmpv.sh and its test are deleted and native-inputs.json shrinks to the simdutf entry the CMake builds still fetch. - Windows: both arches FetchContent the mpv-build dev zips with URL_HASH enforcement, replacing the checksum-less sourceforge download and its ARM64 7-Zip special case; guard scripts updated. The lock plus the Apple pin sites all point at mpv-build commit d7c3d559, whose manifest was verified asset-by-asset against the published release digests (17/17 match). Verified locally: wire and pin-script suites green, runtime-input checks green, all four Android ABI tarballs downloaded/verified/extracted through the real Gradle tasks, the Windows FetchContent block exercised end to end through cmake, the Linux asset hash and layout checked against the workflow contract, and xcodebuild resolved the flipped SwiftPM graph with SwiftPM validating every binary checksum.
2026-09-02 11:31:47 +02:00
parent 8fe7e4bcfd
commit 200d896bea
67 changed files with 6340 additions and 1278 deletions
@@ -0,0 +1,152 @@
+#include <jni.h>
+#include <mpv/client.h>
+#include <pthread.h>
+
+#include <atomic>
+#include <clocale>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <mutex>
+
+extern "C" {
+#include <libavcodec/jni.h>
+}
+
+#include "event.h"
+#include "jni_utils.h"
+#include "log.h"
+
+#define ARRAYLEN(a) (sizeof(a) / sizeof(a[0]))
+
+void render_cleanup(JNIEnv* env);
+
+static void* destroy_mpv_thread(void* arg) {
+  mpv_handle* handle = (mpv_handle*)arg;
+  mpv_terminate_destroy(handle);
+  return NULL;
+}
+
+// Fire-and-forget mpv_terminate_destroy on a detached thread.
+// Safe because the event thread has been joined and g_mpv cleared —
+// no other code references this handle.
+static void async_destroy(mpv_handle* handle) {
+  pthread_t tid;
+  if (pthread_create(&tid, NULL, destroy_mpv_thread, handle) == 0) {
+    pthread_detach(tid);
+  } else {
+    // Fallback: destroy synchronously if thread creation fails
+    mpv_terminate_destroy(handle);
+  }
+}
+
+extern "C" {
+jni_func(void, nativeCreate, jobject appctx);
+jni_func(void, nativeInit);
+jni_func(void, nativeDestroy);
+
+jni_func(void, nativeCommand, jobjectArray jarray);
+};
+
+JavaVM* g_vm;
+mpv_handle* g_mpv;
+std::atomic<bool> g_event_thread_request_exit(false);
+
+static pthread_t event_thread_id;
+static std::mutex g_lifecycle_mutex;
+
+static void prepare_environment(JNIEnv* env, jobject appctx) {
+  setlocale(LC_NUMERIC, "C");
+
+  if (!env->GetJavaVM(&g_vm) && g_vm) av_jni_set_java_vm(g_vm, NULL);
+
+  jobject global_appctx = env->NewGlobalRef(appctx);
+  if (global_appctx) av_jni_set_android_app_ctx(global_appctx, NULL);
+
+  init_methods_cache(env);
+}
+
+jni_func(void, nativeCreate, jobject appctx) {
+  std::lock_guard<std::mutex> lock(g_lifecycle_mutex);
+  prepare_environment(env, appctx);
+
+  mpv_handle* leaked_mpv = NULL;
+  if (g_mpv) {
+    ALOGE("destroying leaked mpv instance");
+    leaked_mpv = g_mpv;
+    g_event_thread_request_exit = true;
+    mpv_wakeup(leaked_mpv);
+    pthread_join(event_thread_id, NULL);
+    g_mpv = NULL;
+    render_cleanup(env);
+  }
+
+  g_mpv = mpv_create();
+  if (!g_mpv) {
+    die("context init failed");
+    if (leaked_mpv) mpv_terminate_destroy(leaked_mpv);
+    return;
+  }
+
+  mpv_request_log_messages(g_mpv, "v");
+
+  // Async teardown of leaked handle — doesn't block caller
+  if (leaked_mpv) async_destroy(leaked_mpv);
+}
+
+jni_func(void, nativeInit) {
+  if (!g_mpv) {
+    die("mpv is not created");
+    return;
+  }
+
+  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) {
+    die("thread create failed");
+    return;
+  }
+  pthread_setname_np(event_thread_id, "event_thread");
+}
+
+jni_func(void, nativeDestroy) {
+  std::lock_guard<std::mutex> lock(g_lifecycle_mutex);
+  if (!g_mpv) {
+    ALOGV("mpv destroy called but it's already destroyed");
+    return;
+  }
+  mpv_handle* local_mpv = g_mpv;
+
+  g_event_thread_request_exit = true;
+  mpv_wakeup(local_mpv);
+  pthread_join(event_thread_id, NULL);
+
+  g_mpv = NULL;
+  render_cleanup(env);
+
+  // Async teardown — nativeDestroy returns immediately
+  async_destroy(local_mpv);
+}
+
+jni_func(void, nativeCommand, jobjectArray jarray) {
+  CHECK_MPV_INIT();
+
+  const char* arguments[128] = {0};
+  int len = env->GetArrayLength(jarray);
+  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);
+
+  mpv_command(g_mpv, arguments);
+
+  for (int i = 0; i < len; ++i)
+    env->ReleaseStringUTFChars((jstring)env->GetObjectArrayElement(jarray, i), arguments[i]);
+}