expo-libmpv 0.5.3 → 0.5.4

package/android/build.gradle

@@ -36,7 +36,7 @@ if (useManagedAndroidSdkVersions) {
 }
 
 dependencies {
-  implementation "com.libmpv:android-libmpv:0.7.3"
+  implementation "com.libmpv:android-libmpv:0.7.4"
 }
 
 android {

package/android/src/main/java/com/libmpv/LibmpvRenderer.kt

@@ -27,6 +27,7 @@ class LibmpvRenderer(
 
     companion object {
         private const val TAG = "expo-libmpv"
+        private const val LOG_LEVEL_INFO = 20
         private const val LOG_LEVEL_WARN = 30
     }
 
@@ -35,22 +36,32 @@ class LibmpvRenderer(
     @Volatile private var state: State = State.NEW
     @Volatile private var destroyed = false
     @Volatile private var loadedUrl: String? = null
+    @Volatile private var surfaceAttached = false
+    @Volatile var surfaceReady = false
 
     private var mpvDirectory: String? = null
 
     private inline val mpvAlive: Boolean
-        get() = when (state) {
-            State.CREATED, State.INITIALIZED, State.ACTIVE -> true
-            else -> false
+        get() {
+            return when (state) {
+                State.CREATED,
+                State.INITIALIZED,
+                State.ACTIVE -> true
+                else -> false
+            }
         }
 
     private inline val shuttingDown: Boolean
-        get() = state == State.SHUTTING_DOWN || state == State.DESTROYED
+        get() {
+            return state == State.SHUTTING_DOWN || state == State.DESTROYED
+        }
 
     private val mainHandler = Handler(Looper.getMainLooper())
 
     fun runCommand(command: Array<String>) {
-        if (!mpvAlive || shuttingDown) return
+        if (!mpvAlive || shuttingDown) {
+            return
+        }
         try {
             MPVLib.command(command)
         } catch (e: Exception) {
@@ -59,7 +70,9 @@ class LibmpvRenderer(
     }
 
     fun setOptionString(option: String, value: String) {
-        if (!mpvAlive || shuttingDown) return
+        if (!mpvAlive || shuttingDown) {
+            return
+        }
         try {
             MPVLib.setOptionString(option, value)
         } catch (e: Exception) {
@@ -67,70 +80,104 @@ class LibmpvRenderer(
         }
     }
 
-
     fun start() {
         synchronized(stateLock) {
-            if (state != State.NEW && state != State.DESTROYED) return
             try {
                 MPVLib.create(surfaceView.context.applicationContext)
                 createMpvDirectory()
                 state = State.CREATED
             } catch (e: Exception) {
                 logException(e)
-                return
             }
         }
-
-        initMpv()
-        attachSurfaceAndConfigure()
     }
 
     fun destroy() {
-    val doTeardown: Boolean
-    synchronized(stateLock) {
-        doTeardown = when (state) {
-            State.NEW, State.SHUTTING_DOWN, State.DESTROYED -> false
-            else -> true
+        val doTeardown: Boolean
+        synchronized(stateLock) {
+            doTeardown = when (state) {
+                State.NEW,
+                State.SHUTTING_DOWN,
+                State.DESTROYED -> false
+                else -> true
+            }
+            if (doTeardown) {
+                state = State.SHUTTING_DOWN
+            }
+        }
+        if (!doTeardown) {
+            return
         }
-        if (doTeardown) state = State.SHUTTING_DOWN
-    }
-    if (!doTeardown) return
-
-    destroyed = true
 
-    try {
-        loadedUrl = null
-        stopPlayback()
-        detachSurfaceInternal()
+        destroyed = true
 
-        mainHandler.post {
-            try {
-                MPVLib.destroy()
-            } finally {
-                synchronized(stateLock) {
-                    state = State.DESTROYED
+        try {
+            loadedUrl = null
+            stopPlayback()
+
+            mainHandler.post {
+                try {
+                    detachSurfaceForDestroy()
+                    MPVLib.destroy()
+                } finally {
+                    synchronized(stateLock) {
+                        state = State.DESTROYED
+                    }
                 }
             }
+        } catch (e: Exception) {
+            logException(e)
+            synchronized(stateLock) {
+                state = State.DESTROYED
+            }
+        }
+    }
+
+    fun attachSurfaceIfNeeded() {
+        if (!surfaceReady || surfaceAttached) {
+            return
         }
-    } catch (e: Exception) {
-        logException(e)
+
+        MPVLib.attachSurface(surfaceView.holder.surface)
+        surfaceAttached = true
+
         synchronized(stateLock) {
-            state = State.DESTROYED
+            MPVLib.init()
+            state = State.INITIALIZED
         }
+
+        addObservers()
+        applyConfiguration()
+        state = State.ACTIVE
+        maybeStartPlayback()
     }
-}
 
+    private fun detachSurfaceForDestroy() {
+        if (!surfaceAttached) {
+            return
+        }
+        try {
+            MPVLib.detachSurface()
+        } catch (e: Exception) {
+            logException(e)
+        } finally {
+            surfaceAttached = false
+        }
+    }
 
     fun onSessionUpdated() {
-        if (!mpvAlive || shuttingDown) return
-        maybeStartPlayback()
+        if (!mpvAlive || shuttingDown) {
+            return
+        }
         applyDeferredState()
         applyContinuousState()
     }
 
     private fun initMpv() {
         synchronized(stateLock) {
-            if (shuttingDown || state != State.CREATED) return
+            if (shuttingDown || state != State.CREATED) {
+                return
+            }
             try {
                 MPVLib.init()
                 state = State.INITIALIZED
@@ -142,25 +189,10 @@ class LibmpvRenderer(
         addObservers()
     }
 
-    private fun attachSurfaceAndConfigure() {
-        if (!mpvAlive || shuttingDown) return
-        try {
-            MPVLib.attachSurface(surfaceView.holder.surface)
-            synchronized(stateLock) {
-                if (state == State.CREATED || state == State.INITIALIZED) {
-                    state = State.ACTIVE
-                }
-            }
-            applyConfiguration()
-            MPVLib.setPropertyString("pause", "yes")
-            maybeStartPlayback()
-        } catch (e: Exception) {
-            logException(e)
-        }
-    }
-
     private fun addObservers() {
-        if (!mpvAlive || shuttingDown) return
+        if (!mpvAlive || shuttingDown) {
+            return
+        }
         try {
             MPVLib.removeObservers()
             MPVLib.addObserver(this)
@@ -181,19 +213,23 @@ class LibmpvRenderer(
     }
 
     private fun applyConfiguration() {
-        if (!mpvAlive || shuttingDown) return
+        if (!mpvAlive || shuttingDown) {
+            return
+        }
         try {
-            MPVLib.setOptionString("force-window", "no")
+            MPVLib.setOptionString("force-window", "yes")
             MPVLib.setOptionString("config", "yes")
-            mpvDirectory?.let {
-                MPVLib.setOptionString("config-dir", it)
-                MPVLib.setOptionString("sub-font-dir", it)
+
+            mpvDirectory?.let { mpvDir ->
+                val fontsPath = "$mpvDir/fonts"
+                MPVLib.setOptionString("config-dir", mpvDir)
+                MPVLib.setOptionString("sub-fonts-dir", fontsPath)
+                MPVLib.setOptionString("sub-font", "Droid Sans Fallback")
             }
 
             MPVLib.setOptionString("keep-open", "always")
             MPVLib.setOptionString("save-position-on-quit", "no")
             MPVLib.setOptionString("ytdl", "no")
-            MPVLib.setOptionString("msg-level", "all=no")
 
             session.videoOutput?.let { videoOutput ->
                 MPVLib.setOptionString("vo", videoOutput)
@@ -203,7 +239,7 @@ class LibmpvRenderer(
             val acceleratedCodecs = session.acceleratedCodecs
             if (!decodingMode.isNullOrBlank() && !acceleratedCodecs.isNullOrBlank()) {
                 MPVLib.setOptionString("hwdec", decodingMode)
-                if (decodingMode != "no"){
+                if (decodingMode != "no") {
                     MPVLib.setOptionString("hwdec-codecs", acceleratedCodecs)
                 }
             }
@@ -212,48 +248,56 @@ class LibmpvRenderer(
             MPVLib.setOptionString("opengl-es", "yes")
 
             val videoSync = session.videoSync
-            if(!videoSync.isNullOrBlank()){
-                if(videoSync == "display-resample"){
+            if (!videoSync.isNullOrBlank()) {
+                if (videoSync == "display-resample") {
                     MPVLib.setOptionString("video-sync", "display-resample")
-                    MPVLib.setOptionString("audio-pitch-correction","no")
+                    MPVLib.setOptionString("audio-pitch-correction", "no")
                     MPVLib.setOptionString("autosync", "1")
-                    MPVLib.setOptionString("correct-pts","no")
+                    MPVLib.setOptionString("correct-pts", "no")
                 }
-                if(videoSync == "audio"){
+                if (videoSync == "audio") {
                     MPVLib.setOptionString("video-sync", "audio")
-                    MPVLib.setOptionString("audio-pitch-correction","yes")
+                    MPVLib.setOptionString("audio-pitch-correction", "yes")
                     MPVLib.setOptionString("autosync", "0")
-                    MPVLib.setOptionString("correct-pts","yes")
+                    MPVLib.setOptionString("correct-pts", "yes")
                 }
             }
 
             MPVLib.setOptionString("scale", "bilinear")
             MPVLib.setOptionString("dscale", "bilinear")
-            MPVLib.setOptionString("tscale","off")
-            MPVLib.setOptionString("interpolation","no")
+            MPVLib.setOptionString("tscale", "off")
+            MPVLib.setOptionString("interpolation", "no")
 
-            MPVLib.setOptionString("ao", "audiotrack")
             MPVLib.setOptionString("alang", "")
+            MPVLib.setOptionString("ao", "audiotrack")
 
-            MPVLib.setOptionString("sub-font-provider", "none")
             MPVLib.setOptionString("slang", "")
             MPVLib.setOptionString("sub-scale-with-window", "yes")
             MPVLib.setOptionString("sub-use-margins", "no")
 
             MPVLib.setOptionString("cache", "yes")
             MPVLib.setOptionString("cache-pause-initial", "yes")
-            MPVLib.setOptionString("audio-buffer","2.0")
-
+            MPVLib.setOptionString("audio-buffer", "2.0")
         } catch (e: Exception) {
             logException(e)
         }
     }
 
     private fun maybeStartPlayback() {
+        if (state != State.ACTIVE) {
+            return
+        }
+        if (!surfaceAttached) {
+            return
+        }
+
         val url = session.playUrl ?: return
-          if (loadedUrl == url) return
+        if (loadedUrl == url) {
+            return
+        }
+
         try {
-              loadedUrl = url
+            loadedUrl = url
             MPVLib.command(arrayOf("loadfile", url, "replace"))
             applyContinuousState()
         } catch (e: Exception) {
@@ -262,8 +306,12 @@ class LibmpvRenderer(
     }
 
     private fun applyContinuousState() {
-        if (!mpvAlive || shuttingDown) return
-        if (!session.hasFileLoaded) return
+        if (!mpvAlive || shuttingDown) {
+            return
+        }
+        if (!session.hasFileLoaded) {
+            return
+        }
 
         MPVLib.command(
             arrayOf("set", "pause", if (session.isPlaying) "no" else "yes")
@@ -271,7 +319,9 @@ class LibmpvRenderer(
     }
 
     private fun applyDeferredState() {
-        if (!mpvAlive || shuttingDown) return
+        if (!mpvAlive || shuttingDown) {
+            return
+        }
 
         session.seekToSeconds?.let { target ->
             if (session.needsApply(LibmpvSession.MpvIntent.SEEK)) {
@@ -293,9 +343,13 @@ class LibmpvRenderer(
             }
         }
 
-        session.selectedSubtitleTrack?.let {
-            if (session.needsApply(LibmpvSession.MpvIntent.SUBTITLE_TRACK)) {
-                val sid = if (it == -1) "no" else (it + 1).toString()
+        session.selectedSubtitleTrack?.let { trackIndex ->
+            if (
+                session.needsApply(LibmpvSession.MpvIntent.SUBTITLE_TRACK) &&
+                session.hasFileLoaded &&
+                surfaceAttached
+            ) {
+                val sid = if (trackIndex == -1) "no" else (trackIndex + 1).toString()
                 MPVLib.command(arrayOf("set", "sid", sid))
                 session.markApplied(LibmpvSession.MpvIntent.SUBTITLE_TRACK)
             }
@@ -303,7 +357,9 @@ class LibmpvRenderer(
     }
 
     private fun stopPlayback() {
-        if (!mpvAlive) return
+        if (!mpvAlive) {
+            return
+        }
         try {
             MPVLib.command(arrayOf("stop"))
             MPVLib.setPropertyString("pause", "yes")
@@ -314,17 +370,13 @@ class LibmpvRenderer(
         }
     }
 
-    private fun detachSurfaceInternal() {
-        try {
-            MPVLib.detachSurface()
-        } catch (e: Exception) {
-            logException(e)
-        }
-    }
-
     override fun logMessage(prefix: String, level: Int, text: String) {
-        if (shuttingDown) return
-        if (level <= LOG_LEVEL_WARN) Log.w(TAG, "[$prefix] $text")
+        if (shuttingDown) {
+            return
+        }
+        if (level <= LOG_LEVEL_WARN) {
+            Log.w(TAG, "[$prefix] $text")
+        }
         onLog(mapOf("prefix" to prefix, "level" to level, "text" to text))
     }
 
@@ -333,56 +385,110 @@ class LibmpvRenderer(
             MPVLib.MpvEvent.MPV_EVENT_FILE_LOADED,
             MPVLib.MpvEvent.MPV_EVENT_PLAYBACK_RESTART -> {
                 session.hasFileLoaded = true
-                mainHandler.post {
-                    applyDeferredState()
-                    MPVLib.setPropertyString("pause", if (session.isPlaying) "no" else "yes")
-                }
+                applyDeferredState()
             }
         }
     }
 
-
-    override fun eventProperty(property: String) =
+    override fun eventProperty(property: String) {
         onEvent(mapOf("property" to property, "kind" to "none"))
+    }
 
-    override fun eventProperty(property: String, value: Long) =
+    override fun eventProperty(property: String, value: Long) {
         onEvent(mapOf("property" to property, "kind" to "long", "value" to value))
+    }
 
-    override fun eventProperty(property: String, value: Double) =
+    override fun eventProperty(property: String, value: Double) {
         onEvent(mapOf("property" to property, "kind" to "double", "value" to value))
+    }
 
-    override fun eventProperty(property: String, value: Boolean) =
+    override fun eventProperty(property: String, value: Boolean) {
         onEvent(mapOf("property" to property, "kind" to "boolean", "value" to value))
+    }
 
-    override fun eventProperty(property: String, value: String) =
+    override fun eventProperty(property: String, value: String) {
         onEvent(mapOf("property" to property, "kind" to "string", "value" to value))
+    }
 
     private fun createMpvDirectory() {
-        if (shuttingDown) return
+        if (shuttingDown) {
+            return
+        }
 
         val ctx = surfaceView.context.applicationContext
-        val dir = File(ctx.getExternalFilesDir("mpv"), "mpv")
+        val mpvRoot = File(ctx.getExternalFilesDir("mpv"), "mpv")
+        val fontsDir = File(mpvRoot, "fonts")
 
         try {
-            if (!dir.exists() && !dir.mkdirs()) return
-            mpvDirectory = dir.absolutePath
+            logMessage(
+                "LimpbvRenderer->createMpvDirectory",
+                LOG_LEVEL_INFO,
+                "expo-libmpv version 0.5.4-0"
+            )
+            logMessage(
+                "LimpbvRenderer->createMpvDirectory",
+                LOG_LEVEL_INFO,
+                "Attempting to create the MPV dir"
+            )
+
+            if (!mpvRoot.exists() && !mpvRoot.mkdirs()) {
+                logMessage(
+                    "LimpbvRenderer->createMpvDirectory",
+                    LOG_LEVEL_INFO,
+                    "Cannot make mpv directory"
+                )
+                return
+            }
 
-            val subFont = File(dir, "subfont.ttf")
+            if (!fontsDir.exists() && !fontsDir.mkdirs()) {
+                logMessage(
+                    "LimpbvRenderer->createMpvDirectory",
+                    LOG_LEVEL_INFO,
+                    "Cannot make fonts directory"
+                )
+                return
+            }
+
+            mpvDirectory = mpvRoot.absolutePath
+
+            val subFont = File(fontsDir, "subfont.ttf")
             if (!subFont.exists()) {
+                logMessage(
+                    "LimpbvRenderer->createMpvDirectory",
+                    LOG_LEVEL_INFO,
+                    "Creating font files"
+                )
                 ctx.assets.open("subfont.ttf").use { inS ->
                     FileOutputStream(subFont).use { outS ->
                         inS.copyTo(outS)
                     }
                 }
+            } else {
+                logMessage(
+                    "LimpbvRenderer->createMpvDirectory",
+                    LOG_LEVEL_INFO,
+                    "Font files already exist"
+                )
             }
 
-            val mpvConf = File(dir, "mpv.conf")
+            val mpvConf = File(mpvRoot, "mpv.conf")
             if (!mpvConf.exists()) {
+                logMessage(
+                    "LimpbvRenderer->createMpvDirectory",
+                    LOG_LEVEL_INFO,
+                    "Creating mpv conf"
+                )
                 ctx.assets.open("mpv.conf").use { inS ->
                     FileOutputStream(mpvConf).use { outS ->
                         inS.copyTo(outS)
                     }
                 }
+            } else {
+                logMessage(
+                    "LimpbvRenderer->createMpvDirectory",
+                    LOG_LEVEL_INFO,
+                    "mpv conf already exists"
+                )
             }
         } catch (e: Exception) {
             Log.e(TAG, "mpv directory init failed", e)
@@ -390,9 +496,15 @@ class LibmpvRenderer(
     }
 
     private fun logException(e: Exception) {
-        if (shuttingDown) return
+        if (shuttingDown) {
+            return
+        }
         try {
-            MPVLib.logMessage("RNLE", 20, e.message ?: "Unknown mpv error")
+            MPVLib.logMessage(
+                "LimpbvRenderer->logException",
+                LOG_LEVEL_INFO,
+                e.message ?: "Unknown mpv error"
+            )
         } catch (_: Exception) {
             Log.e(TAG, "mpv error", e)
         }

package/android/src/main/java/com/libmpv/LibmpvView.kt

@@ -48,23 +48,24 @@ class LibmpvView(
         return attached && surfaceReady
     }
 
-    private fun reconcileRenderer() {
-        if (shouldHaveRenderer() && renderer == null) {
-            renderer = LibmpvRenderer(
-                session = session,
-                surfaceView = surfaceView,
-                onLog = { payload -> onLibmpvLog(payload) },
-                onEvent = { payload -> onLibmpvEvent(payload) }
-            )
-            renderer!!.start()
-            return
-        }
+private fun reconcileRenderer() {
+    if (renderer == null && attached) {
+        renderer = LibmpvRenderer(
+            session = session,
+            surfaceView = surfaceView,
+            onLog = { payload -> onLibmpvLog(payload) },
+            onEvent = { payload -> onLibmpvEvent(payload) }
+        )
+        renderer!!.start()
+    }
 
-        if (!shouldHaveRenderer() && renderer != null) {
-            renderer!!.destroy()
-            renderer = null
+    renderer?.let { r ->
+        if (surfaceReady) {
+            r.attachSurfaceIfNeeded()
         }
     }
+}
+
 
     fun onSessionUpdatedFromProps() {
         reconcileRenderer()
@@ -85,11 +86,13 @@ class LibmpvView(
 
     override fun surfaceCreated(holder: SurfaceHolder) {
         surfaceReady = true
-        reconcileRenderer()
+        renderer?.surfaceReady = true
+        renderer?.attachSurfaceIfNeeded()
     }
 
     override fun surfaceDestroyed(holder: SurfaceHolder) {
         surfaceReady = false
+        renderer?.surfaceReady = false
         reconcileRenderer()
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-libmpv",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "A libmpv Fabric component for Android",
   "main": "build/index.js",
   "types": "build/index.d.ts",