expo-libmpv 0.2.5 → 0.3.0

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'com.libmpv'
-version = '0.2.5'
+version = '0.3.0'
 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.2.5"
+    versionName "0.3.0"
   }
   lintOptions {
     abortOnError false

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

@@ -7,99 +7,107 @@ class LibmpvVideoModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("LibmpvVideo")
     View(LibmpvVideoView::class) {
-      Events("onLibmpvLog", "onLibmpvEvent")
+        Events("onLibmpvLog", "onLibmpvEvent")
 
-      AsyncFunction("runCommand") { view: LibmpvVideoView, orders: String ->
-        view.runCommand(orders)
-      }
+        AsyncFunction("runCommand") { view: LibmpvVideoView, orders: String ->
+            view.runCommand(orders)
+        }
 
-      AsyncFunction("setOptionString") { view: LibmpvVideoView, options: String ->
-        view.setOptionString(options)
-      }
+        AsyncFunction("setOptionString") { view: LibmpvVideoView, options: String ->
+            view.setOptionString(options)
+        }
 
-      Prop("playUrl") { view: LibmpvVideoView, playUrl: String ->
-          view.playUrl = playUrl
-          if (view.isSurfaceReady()) {
-              view.mpv.play(playUrl)
-          } else {
-              view.attemptCreation()
-          }
-          view.log("setPlayUrl", playUrl)
-      }
+        AsyncFunction("cleanup") { view: LibmpvVideoView ->
+            view.cleanup()
+        }
 
-      Prop("useHardwareDecoder") { view: LibmpvVideoView, useHardwareDecoder: Boolean ->
-          view.useHardwareDecoder = useHardwareDecoder
-          if (view.isSurfaceReady()) {
-              view.setHardwareDecoder(useHardwareDecoder)
-          } else {
-              view.attemptCreation()
-          }
-          view.log("setUseHardwareDecoder", "$useHardwareDecoder")
-      }
+        Prop("playUrl") { view: LibmpvVideoView, playUrl: String ->
+            view.playUrl = playUrl
+            if (view.isSurfaceReady()) {
+                view.mpv.play(playUrl)
+            } else {
+                view.attemptCreation()
+            }
+            view.log("setPlayUrl", playUrl)
+        }
 
-      Prop("surfaceWidth") { view: LibmpvVideoView, surfaceWidth: Int ->
-          view.surfaceWidth = surfaceWidth
-          if (view.isSurfaceReady()) {
-              view.mpv.setSurfaceWidth(surfaceWidth)
-          } else {
-              view.attemptCreation()
-          }
-          view.log("setSurfaceWidth", "$surfaceWidth")
-      }
+        Prop("useHardwareDecoder") { view: LibmpvVideoView, useHardwareDecoder: Boolean ->
+            view.useHardwareDecoder = useHardwareDecoder
+            if (view.isSurfaceReady()) {
+                view.setHardwareDecoder(useHardwareDecoder)
+            } else {
+                view.attemptCreation()
+            }
+            view.log("setUseHardwareDecoder", "$useHardwareDecoder")
+        }
 
-      Prop("surfaceHeight") { view: LibmpvVideoView, surfaceHeight: Int ->
-          view.surfaceHeight = surfaceHeight
-          if (view.isSurfaceReady()) {
-              view.mpv.setSurfaceHeight(surfaceHeight)
-          } else {
-              view.attemptCreation()
-          }
-          view.log("setSurfaceHeight", "$surfaceHeight")
-      }
+        Prop("surfaceWidth") { view: LibmpvVideoView, surfaceWidth: Int ->
+            view.surfaceWidth = surfaceWidth
+            if (view.isSurfaceReady()) {
+                view.mpv.setSurfaceWidth(surfaceWidth)
+            } else {
+                view.attemptCreation()
+            }
+            view.log("setSurfaceWidth", "$surfaceWidth")
+        }
 
-      Prop("selectedAudioTrack") { view: LibmpvVideoView, audioTrackIndex: Int ->
-          view.audioIndex = audioTrackIndex
-          if (view.isSurfaceReady()) {
-              val mpvIndex = if (audioTrackIndex != -1) (audioTrackIndex + 1).toString() else "no"
-              view.mpv.setOptionString("aid", mpvIndex)
-          } else {
-              view.attemptCreation()
-          }
-          view.log("selectAudioTrack", "$audioTrackIndex")
-      }
+        Prop("surfaceHeight") { view: LibmpvVideoView, surfaceHeight: Int ->
+            view.surfaceHeight = surfaceHeight
+            if (view.isSurfaceReady()) {
+                view.mpv.setSurfaceHeight(surfaceHeight)
+            } else {
+                view.attemptCreation()
+            }
+            view.log("setSurfaceHeight", "$surfaceHeight")
+        }
 
-      Prop("selectedSubtitleTrack") { view: LibmpvVideoView, subtitleTrackIndex: Int ->
-          view.subtitleIndex = subtitleTrackIndex
-          if (view.isSurfaceReady()) {
-              val mpvIndex = if (subtitleTrackIndex != -1) (subtitleTrackIndex + 1).toString() else "no"
-              view.mpv.setOptionString("sid", mpvIndex)
-          } else {
-              view.attemptCreation()
-          }
-          view.log("selectSubtitleTrack", "$subtitleTrackIndex")
-      }
+        Prop("selectedAudioTrack") { view: LibmpvVideoView, audioTrackIndex: Int ->
+            view.audioIndex = audioTrackIndex
+            if (view.isSurfaceReady()) {
+                val mpvIndex = if (audioTrackIndex != -1) (audioTrackIndex + 1).toString() else "no"
+                view.mpv.setOptionString("aid", mpvIndex)
+            } else {
+                view.attemptCreation()
+            }
+            view.log("selectAudioTrack", "$audioTrackIndex")
+        }
 
-      Prop("seekToSeconds") { view: LibmpvVideoView, seconds: Int ->
-          if (view.isSurfaceReady()) {
-              view.mpv.seekToSeconds(seconds)
-          }
-          view.log("seekToSeconds", "$seconds")
-      }
+        Prop("selectedSubtitleTrack") { view: LibmpvVideoView, subtitleTrackIndex: Int ->
+            view.subtitleIndex = subtitleTrackIndex
+            if (view.isSurfaceReady()) {
+                val mpvIndex = if (subtitleTrackIndex != -1) (subtitleTrackIndex + 1).toString() else "no"
+                view.mpv.setOptionString("sid", mpvIndex)
+            } else {
+                view.attemptCreation()
+            }
+            view.log("selectSubtitleTrack", "$subtitleTrackIndex")
+        }
 
-      Prop("isPlaying") { view: LibmpvVideoView, isPlaying: Boolean ->
-          if (view.isSurfaceReady() && view.mpv.hasPlayedOnce()) {
-              when {
-                  isPlaying && !view.mpv.isPlaying() -> {
-                      view.mpv.unpause()
-                  }
-                  !isPlaying && view.mpv.isPlaying() -> {
-                      view.mpv.pause()
-                  }
-              }
-          } else {
-              view.attemptCreation()
-          }
-      }
+        Prop("seekToSeconds") { view: LibmpvVideoView, seconds: Int ->
+            if (view.isSurfaceReady()) {
+                view.mpv.seekToSeconds(seconds)
+            }
+            view.log("seekToSeconds", "$seconds")
+        }
+
+        Prop("isPlaying") { view: LibmpvVideoView, isPlaying: Boolean ->
+            if (view.isSurfaceReady() && view.mpv.hasPlayedOnce()) {
+                when {
+                    isPlaying && !view.mpv.isPlaying() -> {
+                        view.mpv.unpause()
+                    }
+                    !isPlaying && view.mpv.isPlaying() -> {
+                        view.mpv.pause()
+                    }
+                }
+            } else {
+                view.attemptCreation()
+            }
+        }
+
+        OnViewDestroys { view: LibmpvVideoView ->
+            view.cleanup()
+        }
     }
   }
 }

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

@@ -1,9 +1,13 @@
 package com.libmpv
 
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import android.view.SurfaceHolder
 import android.view.SurfaceView
 import android.widget.FrameLayout
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import dev.jdtech.mpv.MPVLib
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.views.ExpoView
@@ -41,12 +45,18 @@ class LibmpvVideoView(context: Context, appContext: AppContext) :
         FrameLayout.LayoutParams.MATCH_PARENT,
         FrameLayout.LayoutParams.MATCH_PARENT
     )
-    addView(surfaceView, layoutParams)
+  appContext.activityProvider?.currentActivity?.let { activity ->
+    if (activity is androidx.lifecycle.LifecycleOwner) {
+      activity.lifecycle.addObserver(object : DefaultLifecycleObserver {
+        override fun onDestroy(owner: LifecycleOwner) {
+          log("LibmpvVideoView", "Lifecycle onDestroy -> cleanup()")
+          cleanup()
+        }
+      })
+    }
   }
 
-  fun cleanup() {
-    surfaceView.holder.removeCallback(this)
-    mpv.cleanup()
+    addView(surfaceView, layoutParams)
   }
 
   fun isSurfaceReady(): Boolean = isSurfaceCreated
@@ -176,10 +186,30 @@ class LibmpvVideoView(context: Context, appContext: AppContext) :
 
   override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {}
 
+fun cleanup() {
+  // Launch on background executor so UI returns immediately
+  Thread {
+    try {
+      try { mpv.setPropertyString("pause", "yes") } catch (_: Throwable) {}
+      try { mpv.setPropertyString("ao", "null") } catch (_: Throwable) {}
+      Handler(Looper.getMainLooper()).post {
+        try {
+          surfaceView.holder.removeCallback(this@LibmpvVideoView)
+          mpv.cleanup()
+        } catch (e: Exception) {
+        }
+      }
+    } catch (_: Throwable) {}
+  }.start()
+}
+
   override fun surfaceDestroyed(holder: SurfaceHolder) {
-    mpv.setPropertyString("vo", "null")
-    mpv.setPropertyString("force-window", "no")
-    mpv.detachSurface()
+    try {
+      mpv.setPropertyString("pause", "yes")
+      mpv.setPropertyString("vo", "null")
+      mpv.setPropertyString("force-window", "no")
+    } catch (_: Throwable) {}
+    try { mpv.detachSurface() } catch (_: Throwable) {}
   }
 
   // MPVLib.LogObserver
@@ -237,4 +267,9 @@ class LibmpvVideoView(context: Context, appContext: AppContext) :
       "kind" to "eventId"
     ))
   }
+
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+    cleanup()
+  }
 }

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

@@ -1,5 +1,7 @@
 package com.libmpv
 
+import android.os.Handler
+import android.os.Looper
 import android.content.Context
 import android.util.Log
 import android.view.SurfaceView
@@ -15,7 +17,10 @@ class LibmpvWrapper(private val applicationContext: Context) {
         private var swallow = true
     }
 
-    private var created = false
+    @Volatile private var created = false
+    @Volatile private var destroying = false
+    @Volatile private var isDestroyed = false
+    @Volatile private var cleaning = false
     private var isPlaying = false
     private var hasPlayedOnce = false
     private var eventObserver: MPVLib.EventObserver? = null
@@ -39,6 +44,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     fun getMpvDirectoryPath(): String? = mpvDirectory
 
     private fun createMpvDirectory() {
+        if (isDestroyed) return
         val mpvDir = File(applicationContext.getExternalFilesDir("mpv"), "mpv")
         try {
             mpvDirectory = mpvDir.absolutePath
@@ -68,6 +74,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     private fun logException(exception: Exception) {
+        if (isDestroyed) return
         try {
             val message: String = (exception.message as? String) ?: "Unable to read error message"
             logObserver?.logMessage("RNLE", 20, message)
@@ -77,6 +84,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun addEventObserver(observer: MPVLib.EventObserver) {
+        if (isDestroyed) return
         try {
             if (!created) return
             mpv.removeObservers()
@@ -97,6 +105,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun addLogObserver(observer: MPVLib.LogObserver) {
+        if (isDestroyed) return
         try {
             if (!created) return
             mpv.removeLogObservers()
@@ -109,6 +118,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun setOptionString(option: String, setting: String) {
+        if (isDestroyed) return
         try {
             if (created) mpv.setOptionString(option, setting)
         } catch (e: Exception) {
@@ -118,6 +128,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun setPropertyString(property: String, setting: String) {
+        if (isDestroyed) return
         try {
             if (created) mpv.setPropertyString(property, setting)
         } catch (e: Exception) {
@@ -127,6 +138,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun init() {
+        if (isDestroyed) return
         try {
             if (created) mpv.init()
         } catch (e: Exception) {
@@ -136,6 +148,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun command(orders: Array<String>) {
+        if (isDestroyed) return
         try {
             if (created) mpv.command(orders)
         } catch (e: Exception) {
@@ -145,6 +158,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun attachSurface(surfaceView: SurfaceView) {
+        if (isDestroyed) return
         try {
             if (created) {
                 this.surfaceView = surfaceView
@@ -158,6 +172,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun play(url: String, options: String? = null) {
+        if (isDestroyed) return
         if (!isPlaying) {
             if (options == null) {
                 command(arrayOf("loadfile", url))
@@ -171,11 +186,13 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun pauseOrUnpause() {
+        if (isDestroyed) return
         if (!hasPlayedOnce) return
         if (isPlaying) pause() else unpause()
     }
 
     fun pause() {
+        if (isDestroyed) return
         if (!hasPlayedOnce) return
         if (isPlaying) {
             command(arrayOf("set", "pause", "yes"))
@@ -184,6 +201,7 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun unpause() {
+        if (isDestroyed) return
         if (!hasPlayedOnce) return
         if (!isPlaying) {
             command(arrayOf("set", "pause", "no"))
@@ -192,12 +210,14 @@ class LibmpvWrapper(private val applicationContext: Context) {
     }
 
     fun seekToSeconds(seconds: Int) {
+        if (isDestroyed) return
         if (created) {
             command(arrayOf("seek", seconds.toString(), "absolute"))
         }
     }
 
     private fun applySurfaceDimensions() {
+        if (isDestroyed) return
         if (surfaceHeight != -1 && surfaceWidth != -1 && surfaceView != null) {
             surfaceView?.holder?.setFixedSize(surfaceWidth, surfaceHeight)
         }
@@ -213,64 +233,42 @@ class LibmpvWrapper(private val applicationContext: Context) {
         applySurfaceDimensions()
     }
 
-    fun detachSurface() {
-        try {
-            mpv.detachSurface()
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
-        }
-    }
+  fun detachSurface(){
+    if(isDestroyed) return
+    try{
 
-    fun destroy() {
-        try {
-            mpv.removeObservers()
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
-        }
-        try {
-            mpv.removeLogObservers()
-        } catch (e: Exception) {
-            if (!swallow) throw e
-        }
-        try {
-            mpv.destroy()
-            created = false
-        } catch (e: Exception) {
-            logException(e)
-            if (!swallow) throw e
-        }
-    }
+    }catch(swallow:Exception){}
+  }
 
-    fun cleanup() {
-        if (created) {
-            try {
-                pause()
-                setPropertyString("vo", "null")
-                setPropertyString("ao", "null")
-            } catch (e: Exception) {
-                logException(e)
-                if (!swallow) throw e
-            }
-            try {
-                setOptionString("force-window", "no")
-            } catch (e: Exception) {
-                logException(e)
-                if (!swallow) throw e
-            }
-            try {
-                detachSurface()
-            } catch (e: Exception) {
-                logException(e)
-                if (!swallow) throw e
-            }
-            try {
-                destroy()
-            } catch (e: Exception) {
-                logException(e)
-                if (!swallow) throw e
-            }
-        }
+
+fun cleanup() {
+  if (!created || cleaning) return
+  cleaning = true
+
+  Thread {
+    try {
+      safe { command(arrayOf("stop")) }
+      safe { setPropertyString("pause", "yes") }
+      safe { setPropertyString("vo", "null") }
+      safe { setPropertyString("ao", "null") }
+      safe { detachSurface() }
+      Handler(Looper.getMainLooper()).post {
+        safe { mpv.removeObservers() }
+        safe { mpv.removeLogObservers() }
+        safe { mpv.destroy() }
+        created = false
+        cleaning = false
+      }
+    } catch (e: Exception) {
+      logException(e)
+      cleaning = false
     }
+  }.start()
+}
+
+  private inline fun safe(block: () -> Unit) {
+    try { if (created) block() } catch (e: Exception) { logException(e) }
+  }
+
+  fun destroy() = cleanup()
 }

package/app.json

@@ -1,6 +1,6 @@
 {
     "expo": {
-        "runtimeVersion": "0.2.5",
+        "runtimeVersion": "0.3.0",
         "plugins": [
             [
                 "expo-build-properties",

package/build/LibmpvVideoView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LibmpvVideoView.d.ts","sourceRoot":"","sources":["../src/LibmpvVideoView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAmChF,eAAO,MAAM,WAAW,+GA8CtB,CAAA;AAEF,eAAe,WAAW,CAAA"}
+{"version":3,"file":"LibmpvVideoView.d.ts","sourceRoot":"","sources":["../src/LibmpvVideoView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAmChF,eAAO,MAAM,WAAW,+GAsDtB,CAAA;AAEF,eAAe,WAAW,CAAA"}

package/build/LibmpvVideoView.js

@@ -30,6 +30,13 @@ const EVENT_LOOKUP = {
 };
 const LibmpvVideoView = requireNativeView('LibmpvVideo');
 export const LibmpvVideo = React.forwardRef((props, parentRef) => {
+    React.useEffect(() => {
+        return () => {
+            if (parentRef?.current?.cleanup) {
+                parentRef.current.cleanup();
+            }
+        };
+    }, []);
     // Pass mpv events and logs back up to the parent
     const onLogEvent = (libmpvEvent) => {
         if (props.onLibmpvEvent) {

package/build/LibmpvVideoView.js.map

@@ -1 +1 @@
-{"version":3,"file":"LibmpvVideoView.js","sourceRoot":"","sources":["../src/LibmpvVideoView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeView } from 'expo';\nimport * as React from 'react';\n\nimport { LibmpvVideoViewProps, LibmpvNativeMethods } from './LibmpvVideo.types';\n\nconst styles: any = {\n  videoPlayer: {\n    position: \"absolute\",\n    left: 0,\n    bottom: 0,\n    right: 0,\n    top: 0\n  }\n};\n\nconst EVENT_LOOKUP: any = {\n  0: 'NONE',\n  1: 'SHUTDOWN',\n  2: 'LOG_MESSAGE',\n  3: 'GET_PROPERTY_REPLY',\n  4: 'SET_PROPERTY_REPLY',\n  5: 'COMMAND_REPLY',\n  6: 'START_FILE',\n  7: 'END_FILE',\n  8: 'FILE_LOADED',\n  16: 'CLIENT_MESSAGE',\n  17: 'VIDEO_RECONFIG',\n  18: 'AUDIO_RECONFIG',\n  20: 'SEEK',\n  21: 'PLAYBACK_RESTART',\n  22: 'PROPERTY_CHANGE',\n  24: 'QUEUE_OVERFLOW',\n  25: 'HOOK'\n}\n\nconst LibmpvVideoView: React.ComponentType<LibmpvVideoViewProps> =\n  requireNativeView('LibmpvVideo');\n\nexport const LibmpvVideo = React.forwardRef<LibmpvNativeMethods, LibmpvVideoViewProps>((props: any, parentRef: any) => {\n  // Pass mpv events and logs back up to the parent\n  const onLogEvent = (libmpvEvent: any) => {\n    if (props.onLibmpvEvent) {\n      if (libmpvEvent && libmpvEvent.nativeEvent) {\n        libmpvEvent = libmpvEvent.nativeEvent\n      }\n      if (libmpvEvent.eventId) {\n        libmpvEvent.value = parseInt(libmpvEvent.eventId, 10)\n        libmpvEvent.eventKind = EVENT_LOOKUP[libmpvEvent.eventId]\n      }\n      else if (libmpvEvent.kind === 'long' || libmpvEvent.kind === 'double') {\n        libmpvEvent.value = Number(libmpvEvent.value)\n      }\n      else if (libmpvEvent.kind === 'boolean') {\n        libmpvEvent.value = libmpvEvent.value === 'true'\n      }\n      return props.onLibmpvEvent(libmpvEvent)\n    }\n  }\n  const onLibmpvLog = (libmpvLog: any) => {\n    if (props.onLibmpvLog) {\n      if (libmpvLog && libmpvLog.nativeEvent) {\n        libmpvLog = libmpvLog.nativeEvent\n      }\n      return props.onLibmpvLog(libmpvLog);\n    }\n  }\n\n  // The order props are handled in the native code is non-deterministic\n  // Each native prop setter checks to see if all required props are set\n  // Only then will it try to create an instance of mpv\n  return <LibmpvVideoView\n    ref={parentRef}\n    style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer}\n    playUrl={props.playUrl}\n    isPlaying={props.isPlaying}\n    useHardwareDecoder={props.useHardwareDecoder}\n    surfaceWidth={props.surfaceWidth}\n    surfaceHeight={props.surfaceHeight}\n    selectedAudioTrack={props.selectedAudioTrack}\n    selectedSubtitleTrack={props.selectedSubtitleTrack}\n    seekToSeconds={props.seekToSeconds}\n    onLibmpvEvent={onLogEvent}\n    onLibmpvLog={onLibmpvLog}\n  />\n})\n\nexport default LibmpvVideo\n"]}
+{"version":3,"file":"LibmpvVideoView.js","sourceRoot":"","sources":["../src/LibmpvVideoView.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,MAAM,MAAM,GAAQ;IAClB,WAAW,EAAE;QACX,QAAQ,EAAE,UAAU;QACpB,IAAI,EAAE,CAAC;QACP,MAAM,EAAE,CAAC;QACT,KAAK,EAAE,CAAC;QACR,GAAG,EAAE,CAAC;KACP;CACF,CAAC;AAEF,MAAM,YAAY,GAAQ;IACxB,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,UAAU;IACb,CAAC,EAAE,aAAa;IAChB,CAAC,EAAE,oBAAoB;IACvB,CAAC,EAAE,oBAAoB;IACvB,CAAC,EAAE,eAAe;IAClB,CAAC,EAAE,YAAY;IACf,CAAC,EAAE,UAAU;IACb,CAAC,EAAE,aAAa;IAChB,EAAE,EAAE,gBAAgB;IACpB,EAAE,EAAE,gBAAgB;IACpB,EAAE,EAAE,gBAAgB;IACpB,EAAE,EAAE,MAAM;IACV,EAAE,EAAE,kBAAkB;IACtB,EAAE,EAAE,iBAAiB;IACrB,EAAE,EAAE,gBAAgB;IACpB,EAAE,EAAE,MAAM;CACX,CAAA;AAED,MAAM,eAAe,GACnB,iBAAiB,CAAC,aAAa,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAA4C,CAAC,KAAU,EAAE,SAAc,EAAE,EAAE;IACpH,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,OAAO,GAAG,EAAE;YACV,IAAI,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;gBAChC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,iDAAiD;IACjD,MAAM,UAAU,GAAG,CAAC,WAAgB,EAAE,EAAE;QACtC,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,WAAW,IAAI,WAAW,CAAC,WAAW,EAAE,CAAC;gBAC3C,WAAW,GAAG,WAAW,CAAC,WAAW,CAAA;YACvC,CAAC;YACD,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACxB,WAAW,CAAC,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;gBACrD,WAAW,CAAC,SAAS,GAAG,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;YAC3D,CAAC;iBACI,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,IAAI,WAAW,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtE,WAAW,CAAC,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;YAC/C,CAAC;iBACI,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxC,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,KAAK,MAAM,CAAA;YAClD,CAAC;YACD,OAAO,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;QACzC,CAAC;IACH,CAAC,CAAA;IACD,MAAM,WAAW,GAAG,CAAC,SAAc,EAAE,EAAE;QACrC,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,SAAS,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;gBACvC,SAAS,GAAG,SAAS,CAAC,WAAW,CAAA;YACnC,CAAC;YACD,OAAO,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;IACH,CAAC,CAAA;IAED,sEAAsE;IACtE,sEAAsE;IACtE,qDAAqD;IACrD,OAAO,CAAC,eAAe,CACrB,GAAG,CAAC,CAAC,SAAS,CAAC,CACf,KAAK,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CACpE,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CACvB,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAC3B,kBAAkB,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAC7C,YAAY,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CACjC,aAAa,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CACnC,kBAAkB,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAC7C,qBAAqB,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CACnD,aAAa,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CACnC,aAAa,CAAC,CAAC,UAAU,CAAC,CAC1B,WAAW,CAAC,CAAC,WAAW,CAAC,EACzB,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,eAAe,WAAW,CAAA","sourcesContent":["import { requireNativeView } from 'expo';\nimport * as React from 'react';\n\nimport { LibmpvVideoViewProps, LibmpvNativeMethods } from './LibmpvVideo.types';\n\nconst styles: any = {\n  videoPlayer: {\n    position: \"absolute\",\n    left: 0,\n    bottom: 0,\n    right: 0,\n    top: 0\n  }\n};\n\nconst EVENT_LOOKUP: any = {\n  0: 'NONE',\n  1: 'SHUTDOWN',\n  2: 'LOG_MESSAGE',\n  3: 'GET_PROPERTY_REPLY',\n  4: 'SET_PROPERTY_REPLY',\n  5: 'COMMAND_REPLY',\n  6: 'START_FILE',\n  7: 'END_FILE',\n  8: 'FILE_LOADED',\n  16: 'CLIENT_MESSAGE',\n  17: 'VIDEO_RECONFIG',\n  18: 'AUDIO_RECONFIG',\n  20: 'SEEK',\n  21: 'PLAYBACK_RESTART',\n  22: 'PROPERTY_CHANGE',\n  24: 'QUEUE_OVERFLOW',\n  25: 'HOOK'\n}\n\nconst LibmpvVideoView: React.ComponentType<LibmpvVideoViewProps> =\n  requireNativeView('LibmpvVideo');\n\nexport const LibmpvVideo = React.forwardRef<LibmpvNativeMethods, LibmpvVideoViewProps>((props: any, parentRef: any) => {\n  React.useEffect(() => {\n    return () => {\n      if (parentRef?.current?.cleanup) {\n        parentRef.current.cleanup();\n      }\n    };\n  }, []);\n\n  // Pass mpv events and logs back up to the parent\n  const onLogEvent = (libmpvEvent: any) => {\n    if (props.onLibmpvEvent) {\n      if (libmpvEvent && libmpvEvent.nativeEvent) {\n        libmpvEvent = libmpvEvent.nativeEvent\n      }\n      if (libmpvEvent.eventId) {\n        libmpvEvent.value = parseInt(libmpvEvent.eventId, 10)\n        libmpvEvent.eventKind = EVENT_LOOKUP[libmpvEvent.eventId]\n      }\n      else if (libmpvEvent.kind === 'long' || libmpvEvent.kind === 'double') {\n        libmpvEvent.value = Number(libmpvEvent.value)\n      }\n      else if (libmpvEvent.kind === 'boolean') {\n        libmpvEvent.value = libmpvEvent.value === 'true'\n      }\n      return props.onLibmpvEvent(libmpvEvent)\n    }\n  }\n  const onLibmpvLog = (libmpvLog: any) => {\n    if (props.onLibmpvLog) {\n      if (libmpvLog && libmpvLog.nativeEvent) {\n        libmpvLog = libmpvLog.nativeEvent\n      }\n      return props.onLibmpvLog(libmpvLog);\n    }\n  }\n\n  // The order props are handled in the native code is non-deterministic\n  // Each native prop setter checks to see if all required props are set\n  // Only then will it try to create an instance of mpv\n  return <LibmpvVideoView\n    ref={parentRef}\n    style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer}\n    playUrl={props.playUrl}\n    isPlaying={props.isPlaying}\n    useHardwareDecoder={props.useHardwareDecoder}\n    surfaceWidth={props.surfaceWidth}\n    surfaceHeight={props.surfaceHeight}\n    selectedAudioTrack={props.selectedAudioTrack}\n    selectedSubtitleTrack={props.selectedSubtitleTrack}\n    seekToSeconds={props.seekToSeconds}\n    onLibmpvEvent={onLogEvent}\n    onLibmpvLog={onLibmpvLog}\n  />\n})\n\nexport default LibmpvVideo\n"]}

package/package.json

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

package/src/LibmpvVideoView.tsx

@@ -37,6 +37,14 @@ const LibmpvVideoView: React.ComponentType<LibmpvVideoViewProps> =
   requireNativeView('LibmpvVideo');
 
 export const LibmpvVideo = React.forwardRef<LibmpvNativeMethods, LibmpvVideoViewProps>((props: any, parentRef: any) => {
+  React.useEffect(() => {
+    return () => {
+      if (parentRef?.current?.cleanup) {
+        parentRef.current.cleanup();
+      }
+    };
+  }, []);
+
   // Pass mpv events and logs back up to the parent
   const onLogEvent = (libmpvEvent: any) => {
     if (props.onLibmpvEvent) {