expo-libmpv 0.5.1 → 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/build/LibmpvView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LibmpvView.d.ts","sourceRoot":"","sources":["../src/LibmpvView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAkC7E,eAAO,MAAM,qBAAqB,EAAE,MAA0B,CAAA;AAE9D,eAAO,MAAM,0BAA0B,EAAE,MAAiD,CAAA;AAE1F,eAAO,MAAM,UAAU,8GA+DrB,CAAA;AAEF,eAAe,UAAU,CAAA"}
+{"version":3,"file":"LibmpvView.d.ts","sourceRoot":"","sources":["../src/LibmpvView.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAkC7E,eAAO,MAAM,qBAAqB,EAAE,MAA0B,CAAA;AAE9D,eAAO,MAAM,0BAA0B,EAAE,MAAiD,CAAA;AAE1F,eAAO,MAAM,UAAU,8GA0DrB,CAAA;AAEF,eAAe,UAAU,CAAA"}

package/build/LibmpvView.js

@@ -66,14 +66,10 @@ export const LibmpvView = React.forwardRef((props, parentRef) => {
             return props.onLibmpvLog(libmpvLog);
         }
     };
-    let seekProps = {};
-    if (typeof props?.seekToSeconds === 'number' && props?.seekToSeconds >= 0) {
-        seekProps.seekToSeconds = props.seekToSeconds;
-    }
     // The order props are handled in the native code is non-deterministic
     // Each native prop setter checks to see if all required props are set
     // Only then will it try to create an instance of mpv
-    return <LibmpvViewNative ref={parentRef} {...seekProps} style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer} videoOutput={props.videoOutput} playUrl={props.playUrl} isPlaying={props.isPlaying} decodingMode={props.decodingMode} acceleratedCodecs={props.acceleratedCodecs} videoSync={props.videoSync} surfaceWidth={props.surfaceWidth} surfaceHeight={props.surfaceHeight} selectedAudioTrack={props.selectedAudioTrack} selectedSubtitleTrack={props.selectedSubtitleTrack} onLibmpvEvent={onLogEvent} onLibmpvLog={onLibmpvLog}/>;
+    return <LibmpvViewNative ref={parentRef} style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer} videoOutput={props.videoOutput} playUrl={props.playUrl} isPlaying={props.isPlaying} decodingMode={props.decodingMode} acceleratedCodecs={props.acceleratedCodecs} videoSync={props.videoSync} surfaceWidth={props.surfaceWidth} surfaceHeight={props.surfaceHeight} seekToSeconds={props.seekToSeconds} selectedAudioTrack={props.selectedAudioTrack} selectedSubtitleTrack={props.selectedSubtitleTrack} onLibmpvEvent={onLogEvent} onLibmpvLog={onLibmpvLog}/>;
 });
 export default LibmpvView;
 //# sourceMappingURL=LibmpvView.js.map

package/build/LibmpvView.js.map

@@ -1 +1 @@
-{"version":3,"file":"LibmpvView.js","sourceRoot":"","sources":["../src/LibmpvView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeView } from 'expo';\nimport * as React from 'react';\nimport { LibmpvViewProps, LibmpvViewNativeMethods } from './LibmpvViewTypes';\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 LibmpvViewNative: React.ComponentType<LibmpvViewProps> = requireNativeView('LibmpvView');\n\nexport const DEFAULT_DECODING_MODE: string = \"mediacodec-copy\"\n\nexport const DEFAULT_ACCELERATED_CODECS: string = \"h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1\"\n\nexport const LibmpvView = React.forwardRef<LibmpvViewNativeMethods, LibmpvViewProps>((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  let seekProps: any = {}\n  if (typeof props?.seekToSeconds === 'number' && props?.seekToSeconds >= 0) {\n    seekProps.seekToSeconds = props.seekToSeconds\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\n  return <LibmpvViewNative\n    ref={parentRef}\n    {...seekProps}\n    style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer}\n    videoOutput={props.videoOutput}\n    playUrl={props.playUrl}\n    isPlaying={props.isPlaying}\n    decodingMode={props.decodingMode}\n    acceleratedCodecs={props.acceleratedCodecs}\n    videoSync={props.videoSync}\n    surfaceWidth={props.surfaceWidth}\n    surfaceHeight={props.surfaceHeight}\n    selectedAudioTrack={props.selectedAudioTrack}\n    selectedSubtitleTrack={props.selectedSubtitleTrack}\n    onLibmpvEvent={onLogEvent}\n    onLibmpvLog={onLibmpvLog}\n  />\n})\n\nexport default LibmpvView"]}
+{"version":3,"file":"LibmpvView.js","sourceRoot":"","sources":["../src/LibmpvView.tsx"],"names":[],"mappings":"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","sourcesContent":["import { requireNativeView } from 'expo';\nimport * as React from 'react';\nimport { LibmpvViewProps, LibmpvViewNativeMethods } from './LibmpvViewTypes';\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 LibmpvViewNative: React.ComponentType<LibmpvViewProps> = requireNativeView('LibmpvView');\n\nexport const DEFAULT_DECODING_MODE: string = \"mediacodec-copy\"\n\nexport const DEFAULT_ACCELERATED_CODECS: string = \"h264,hevc,mpeg4,mpeg2video,vp8,vp9,av1\"\n\nexport const LibmpvView = React.forwardRef<LibmpvViewNativeMethods, LibmpvViewProps>((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\n  return <LibmpvViewNative\n    ref={parentRef}\n    style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer}\n    videoOutput={props.videoOutput}\n    playUrl={props.playUrl}\n    isPlaying={props.isPlaying}\n    decodingMode={props.decodingMode}\n    acceleratedCodecs={props.acceleratedCodecs}\n    videoSync={props.videoSync}\n    surfaceWidth={props.surfaceWidth}\n    surfaceHeight={props.surfaceHeight}\n    seekToSeconds={props.seekToSeconds}\n    selectedAudioTrack={props.selectedAudioTrack}\n    selectedSubtitleTrack={props.selectedSubtitleTrack}\n    onLibmpvEvent={onLogEvent}\n    onLibmpvLog={onLibmpvLog}\n  />\n})\n\nexport default LibmpvView"]}

package/package.json

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

package/src/LibmpvView.tsx

@@ -75,18 +75,12 @@ export const LibmpvView = React.forwardRef<LibmpvViewNativeMethods, LibmpvViewPr
     }
   }
 
-  let seekProps: any = {}
-  if (typeof props?.seekToSeconds === 'number' && props?.seekToSeconds >= 0) {
-    seekProps.seekToSeconds = props.seekToSeconds
-  }
-
   // The order props are handled in the native code is non-deterministic
   // Each native prop setter checks to see if all required props are set
   // Only then will it try to create an instance of mpv
 
   return <LibmpvViewNative
     ref={parentRef}
-    {...seekProps}
     style={props.surfaceStyle ? props.surfaceStyle : styles.videoPlayer}
     videoOutput={props.videoOutput}
     playUrl={props.playUrl}
@@ -96,6 +90,7 @@ export const LibmpvView = React.forwardRef<LibmpvViewNativeMethods, LibmpvViewPr
     videoSync={props.videoSync}
     surfaceWidth={props.surfaceWidth}
     surfaceHeight={props.surfaceHeight}
+    seekToSeconds={props.seekToSeconds}
     selectedAudioTrack={props.selectedAudioTrack}
     selectedSubtitleTrack={props.selectedSubtitleTrack}
     onLibmpvEvent={onLogEvent}