expo-libmpv 0.5.11 → 0.5.13

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'com.libmpv'
-version = '0.5.0'
+version = '0.5.13'
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
 applyKotlinExpoModulesCorePlugin()
@@ -43,7 +43,7 @@ android {
   namespace "com.libmpv"
   defaultConfig {
     versionCode 1
-    versionName "0.5.0"
+    versionName "0.5.13"
   }
   lintOptions {
     abortOnError false

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

@@ -8,6 +8,10 @@ import com.libmpv.LibmpvSession
 import dev.jdtech.mpv.MPVLib
 import java.io.File
 import java.io.FileOutputStream
+import org.json.JSONArray
+import org.json.JSONObject
+import java.util.ArrayList
+import java.util.HashMap
 
 class LibmpvRenderer(
     private val session: LibmpvSession,
@@ -252,22 +256,23 @@ class LibmpvRenderer(
             if (!videoSync.isNullOrBlank()) {
                 if (videoSync == "display-resample") {
                     MPVLib.setOptionString("video-sync", "display-resample")
-                    MPVLib.setOptionString("audio-pitch-correction", "no")
-                    MPVLib.setOptionString("autosync", "1")
-                    MPVLib.setOptionString("correct-pts", "no")
+                    MPVLib.setOptionString("interpolation", "yes")
+                    MPVLib.setOptionString("tscale", "oversample")
+                    MPVLib.setOptionString("audio-pitch-correction", "yes")
                 }
                 if (videoSync == "audio") {
                     MPVLib.setOptionString("video-sync", "audio")
-                    MPVLib.setOptionString("audio-pitch-correction", "yes")
-                    MPVLib.setOptionString("autosync", "0")
-                    MPVLib.setOptionString("correct-pts", "yes")
+                    MPVLib.setOptionString("interpolation", "no")
+                    MPVLib.setOptionString("tscale", "off")
                 }
+            } else {
+                MPVLib.setOptionString("video-sync", "audio")
+                MPVLib.setOptionString("interpolation", "no")
+                MPVLib.setOptionString("tscale", "off")
             }
 
             MPVLib.setOptionString("scale", "bilinear")
             MPVLib.setOptionString("dscale", "bilinear")
-            MPVLib.setOptionString("tscale", "off")
-            MPVLib.setOptionString("interpolation", "no")
 
             MPVLib.setOptionString("alang", "")
             MPVLib.setOptionString("ao", "audiotrack")
@@ -392,13 +397,14 @@ class LibmpvRenderer(
     }
 
     override fun logMessage(prefix: String, level: Int, text: String) {
-        if (shuttingDown) {
-            return
-        }
+        if (shuttingDown) return
+
+        val safeText = if (text.length > 1000) text.substring(0, 1000) + "..." else text
+
         if (level <= LOG_LEVEL_WARN) {
-            Log.w(TAG, "[$prefix] $text")
+            Log.w(TAG, "[$prefix] $safeText")
         }
-        onLog(mapOf("prefix" to prefix, "level" to level, "text" to text))
+        onLog(mapOf("prefix" to prefix, "level" to level, "text" to safeText))
     }
 
     override fun event(eventId: Int) {
@@ -435,7 +441,42 @@ class LibmpvRenderer(
     }
 
     override fun eventProperty(property: String, value: String) {
-        onEvent(mapOf("property" to property, "kind" to "string", "value" to value))
+        if (property == "track-list") {
+            try {
+                val jsonArray = JSONArray(value)
+                val tracks = ArrayList<Map<String, Any>>()
+
+                for (i in 0 until jsonArray.length()) {
+                    val item = jsonArray.getJSONObject(i)
+                    val map = HashMap<String, Any>()
+                    val keys = item.keys()
+
+                    while (keys.hasNext()) {
+                        val key = keys.next()
+                        map[key] = item.opt(key).toString()
+                    }
+                    tracks.add(map)
+                }
+
+                onEvent(mapOf(
+                    "property" to property,
+                    "kind" to "track-list",
+                    "value" to tracks
+                ))
+                return
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to parse track-list JSON", e)
+            }
+        }
+
+        val safeValue = if (value.length > 1000) {
+            Log.w(TAG, "Truncating massive property: $property")
+            value.substring(0, 1000) + "..."
+        } else {
+            value
+        }
+
+        onEvent(mapOf("property" to property, "kind" to "string", "value" to safeValue))
     }
 
     private fun createMpvDirectory() {

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

@@ -48,23 +48,23 @@ class LibmpvView(
         return attached && surfaceReady
     }
 
-private fun reconcileRenderer() {
-    if (renderer == null && attached) {
-        renderer = LibmpvRenderer(
-            session = session,
-            surfaceView = surfaceView,
-            onLog = { payload -> onLibmpvLog(payload) },
-            onEvent = { payload -> onLibmpvEvent(payload) }
-        )
-        renderer!!.start()
-    }
+    private fun reconcileRenderer() {
+        if (renderer == null && attached) {
+            renderer = LibmpvRenderer(
+                session = session,
+                surfaceView = surfaceView,
+                onLog = { payload -> onLibmpvLog(payload) },
+                onEvent = { payload -> onLibmpvEvent(payload) }
+            )
+            renderer!!.start()
+        }
 
-    renderer?.let { r ->
-        if (surfaceReady) {
-            r.attachSurfaceIfNeeded()
+        renderer?.let { r ->
+            if (surfaceReady) {
+                r.attachSurfaceIfNeeded()
+            }
         }
     }
-}
 
 
     fun onSessionUpdatedFromProps() {

package/app.json

@@ -1,6 +1,6 @@
 {
     "expo": {
-        "runtimeVersion": "0.5.0",
+        "runtimeVersion": "0.5.13",
         "plugins": [
             [
                 "expo-build-properties",

package/package.json

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