expo-mpv 0.1.5 → 0.1.7

package/README.md

@@ -189,29 +189,6 @@ const media = await playerRef.current?.getMediaInfo();
 - `getCurrentTrackIds()`
 - `getMediaInfo()` — returns codec, resolution, fps, bitrate, hwdec status, pixel format, colorspace
 
-### API changes
-
-If you used an earlier iOS-only version, this release adds and/or formalizes:
-
-- Android support
-- `hwdec` prop for platform-specific hardware decode control
-- `stop()`
-- `removeSubtitle(trackId)`
-- `reloadSubtitles()`
-- `setPropertyString(name, value)`
-- `getCurrentTrackIds()`
-- `getMediaInfo()` for codec, resolution, fps, bitrate, hwdec status
-
-The README examples now assume the shared iOS/Android API surface rather than an iOS-only integration flow.
-
-### Migration notes
-
-- Add `"expo-mpv"` to your Expo plugins list if you previously relied on manual native setup
-- Keep `expo-build-properties` for the iOS 16 deployment target
-- Re-run `npx expo prebuild` after upgrading so the plugin can wire native changes into both platforms
-- Android native dependencies are now fetched as part of the build, so CI should allow Gradle network access on first build
-- If you wrapped the player with platform checks because Android was unsupported, you can simplify that logic once your Android app is configured
-
 ## CJK Subtitle Rendering
 
 This module bundles [Noto Sans CJK SC](https://github.com/notofonts/noto-cjk) (SIL Open Font License) for Chinese/Japanese/Korean subtitle rendering.
@@ -242,18 +219,6 @@ React Native (JS)
 
 On simulator, `vo=gpu` is used instead of `vo=gpu-next` to avoid a crash in `MTLSimDriver` caused by XPC shared memory size limits when libplacebo uploads video frame textures.
 
-## License transition
-
-This project is now licensed under `GPL-3.0-only` instead of MIT.
-
-That means:
-
-- source code and derivative distributions must remain under GPLv3-compatible terms
-- if you redistribute a modified version, you must also provide the corresponding source under GPLv3
-- downstream consumers should review compatibility before bundling this module into closed-source products
-
-Bundled third-party assets and dependencies may carry their own licenses. For example, the bundled Noto font remains under the SIL Open Font License.
-
 ## License
 
 [GPL-3.0](./LICENSE)

package/android/src/main/java/expo/modules/mpv/ExpoMpvView.kt

@@ -1,13 +1,12 @@
 package expo.modules.mpv
 
-import android.app.Activity
-import android.app.Application
 import android.content.Context
-import android.os.Bundle
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.view.SurfaceHolder
 import android.view.SurfaceView
+import android.view.View
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -30,7 +29,7 @@ class ExpoMpvView(context: Context, appContext: AppContext) : ExpoView(context,
     private var nativePtr: Long = 0
     private var isInitialized = false
     private var pendingSource: String? = null
-    private var pendingHwdec: String = "mediacodec"
+    private var pendingHwdec: String = if (isEmulator()) "no" else "mediacodec"
     private val mainHandler = Handler(Looper.getMainLooper())
     private var progressRunnable: Runnable? = null
 
@@ -85,49 +84,36 @@ class ExpoMpvView(context: Context, appContext: AppContext) : ExpoView(context,
                 }
             }
         })
-
-        setupLifecycle()
     }
 
-    // MARK: - Lifecycle
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        destroy()
+    }
 
-    private val lifecycleCallbacks = object : Application.ActivityLifecycleCallbacks {
-        override fun onActivityPaused(activity: Activity) {
-            if (nativePtr != 0L && isInitialized && activity == appContext.currentActivity) {
+    override fun onWindowVisibilityChanged(visibility: Int) {
+        super.onWindowVisibilityChanged(visibility)
+        if (nativePtr != 0L && isInitialized) {
+            if (visibility == View.GONE || visibility == View.INVISIBLE) {
                 setPropertyString("vid", "no")
-            }
-        }
-        override fun onActivityResumed(activity: Activity) {
-            if (nativePtr != 0L && isInitialized && activity == appContext.currentActivity) {
+            } else {
                 setPropertyString("vid", "auto")
             }
         }
-        override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
-        override fun onActivityStarted(activity: Activity) {}
-        override fun onActivityStopped(activity: Activity) {}
-        override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
-        override fun onActivityDestroyed(activity: Activity) {}
-    }
-
-    private fun setupLifecycle() {
-        val app = context.applicationContext as? Application ?: return
-        app.registerActivityLifecycleCallbacks(lifecycleCallbacks)
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        destroy()
     }
 
     fun destroy() {
         stopProgressTimer()
-        val app = context.applicationContext as? Application
-        app?.unregisterActivityLifecycleCallbacks(lifecycleCallbacks)
-        if (nativePtr != 0L) {
-            MPVLib.nativeDestroy(nativePtr)
-            nativePtr = 0
-        }
+        val ptr = nativePtr
+        nativePtr = 0
         isInitialized = false
+        if (ptr != 0L) {
+            // Destroy on background thread to avoid blocking the main thread
+            // (pthread_join + mpv_terminate_destroy can take seconds)
+            Thread {
+                MPVLib.nativeDestroy(ptr)
+            }.start()
+        }
     }
 
     // MARK: - MPV Setup (two-phase: create+options, then initialize after surface)
@@ -145,7 +131,19 @@ class ExpoMpvView(context: Context, appContext: AppContext) : ExpoView(context,
         MPVLib.nativeSetOptionString(nativePtr, "vo", "gpu")
         MPVLib.nativeSetOptionString(nativePtr, "gpu-context", "android")
         MPVLib.nativeSetOptionString(nativePtr, "hwdec", pendingHwdec)
-        MPVLib.nativeSetOptionString(nativePtr, "hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
+        if (pendingHwdec != "no") {
+            MPVLib.nativeSetOptionString(nativePtr, "hwdec-codecs", "h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1")
+        }
+
+        if (isEmulator()) {
+            android.util.Log.w("ExpoMpv", "Emulator detected, hardware decoding disabled (using software decoding)")
+        }
+
+        // Network stream caching
+        MPVLib.nativeSetOptionString(nativePtr, "cache", "yes")
+        MPVLib.nativeSetOptionString(nativePtr, "demuxer-max-bytes", "150M")
+        MPVLib.nativeSetOptionString(nativePtr, "demuxer-max-back-bytes", "50M")
+        MPVLib.nativeSetOptionString(nativePtr, "cache-pause", "yes")
 
         // General
         MPVLib.nativeSetOptionString(nativePtr, "force-window", "yes")
@@ -455,4 +453,24 @@ class ExpoMpvView(context: Context, appContext: AppContext) : ExpoView(context,
         if (nativePtr == 0L) return
         MPVLib.nativeCommand(nativePtr, (listOf(cmd) + args).toTypedArray())
     }
+
+    companion object {
+        private fun isEmulator(): Boolean {
+            return (Build.FINGERPRINT.startsWith("generic")
+                    || Build.FINGERPRINT.startsWith("unknown")
+                    || Build.MODEL.contains("google_sdk")
+                    || Build.MODEL.contains("Emulator")
+                    || Build.MODEL.contains("Android SDK built for x86")
+                    || Build.BOARD == "QC_Reference_Phone"
+                    || Build.MANUFACTURER.contains("Genymotion")
+                    || Build.HOST.startsWith("Build")
+                    || Build.BRAND.startsWith("generic")
+                    || Build.DEVICE.startsWith("generic")
+                    || Build.PRODUCT == "google_sdk"
+                    || Build.PRODUCT.startsWith("sdk")
+                    || Build.PRODUCT.endsWith("_cf")
+                    || Build.HARDWARE.contains("goldfish")
+                    || Build.HARDWARE.contains("ranchu"))
+        }
+    }
 }

package/android/src/main/jni/mpv_jni.cpp

@@ -461,8 +461,12 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void * /*reserved*/) {
         auto fn = (av_jni_set_java_vm_fn)dlsym(avcodec, "av_jni_set_java_vm");
         if (fn) {
             fn(vm, nullptr);
-            LOGI("av_jni_set_java_vm set");
+            LOGI("av_jni_set_java_vm set — MediaCodec hardware decoding available");
+        } else {
+            LOGE("av_jni_set_java_vm symbol not found in libavcodec.so — MediaCodec hwdec may not work");
         }
+    } else {
+        LOGE("Failed to dlopen libavcodec.so — MediaCodec hardware decoding unavailable");
     }
 
     jclass cls = env->FindClass("expo/modules/mpv/MPVLib");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-mpv",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Expo module wrapping libmpv for video playback on iOS and Android",
   "main": "build/index.js",
   "types": "build/index.d.ts",