chore(deps): Update react monorepo to v19.2.6

app.json

@@ -144,8 +144,8 @@
       [
         "./plugins/withGitPod.js",
         {
-          "podName": "MPVKit",
+          "podName": "MPVKit-GPL",
-          "podspecUrl": "https://raw.githubusercontent.com/mpv-ios/MPVKit/0.41.0-av/MPVKit.podspec"
+          "podspecUrl": "https://raw.githubusercontent.com/streamyfin/MPVKit/0.40.0-av/MPVKit-GPL.podspec"
         }
       ]
     ],

app/(auth)/player/direct-player.tsx

@@ -825,10 +825,12 @@ export default function DirectPlayerPage() {
     ],
   );
 
+  /** PiP handler for MPV */
   const _onPictureInPictureChange = useCallback(
     (e: { nativeEvent: { isActive: boolean } }) => {
       const { isActive } = e.nativeEvent;
       setIsPipMode(isActive);
+      // Hide controls when entering PiP
       if (isActive) {
         _setShowControls(false);
       }
@@ -846,9 +848,6 @@ export default function DirectPlayerPage() {
 
   // Memoize video ref functions to prevent unnecessary re-renders
   const startPictureInPicture = useCallback(async () => {
-    // Hide controls BEFORE entering PiP so the window captures a clean view
-    _setShowControls(false);
-    setIsPipMode(true);
     return videoRef.current?.startPictureInPicture?.();
   }, []);
 
@@ -1254,7 +1253,6 @@ export default function DirectPlayerPage() {
                 nowPlayingMetadata={nowPlayingMetadata}
                 onProgress={onProgress}
                 onPlaybackStateChange={onPlaybackStateChanged}
-                onPictureInPictureChange={_onPictureInPictureChange}
                 onLoad={() => setIsVideoLoaded(true)}
                 onError={(e: { nativeEvent: MpvOnErrorEventPayload }) => {
                   console.error("Video Error:", e.nativeEvent);

bun.lock

@@ -56,8 +56,8 @@
         "lodash": "4.18.1",
         "nativewind": "^2.0.11",
         "patch-package": "^8.0.0",
-        "react": "19.2.3",
+        "react": "19.2.6",
-        "react-dom": "19.2.3",
+        "react-dom": "19.2.6",
         "react-i18next": "17.0.8",
         "react-native": "npm:react-native-tvos@0.85.3-0",
         "react-native-awesome-slider": "^2.9.0",
@@ -68,7 +68,7 @@
         "react-native-device-info": "^15.0.0",
         "react-native-draggable-flatlist": "^4.0.3",
         "react-native-edge-to-edge": "^1.7.0",
-        "react-native-gesture-handler": "~3.0.0",
+        "react-native-gesture-handler": "~2.31.1",
         "react-native-glass-effect-view": "^1.0.0",
         "react-native-google-cast": "^4.9.1",
         "react-native-image-colors": "^2.4.0",
@@ -109,7 +109,7 @@
         "expo-doctor": "1.19.7",
         "husky": "9.1.7",
         "lint-staged": "17.0.5",
-        "react-test-renderer": "19.2.3",
+        "react-test-renderer": "19.2.6",
         "typescript": "5.9.3",
       },
     },
@@ -292,6 +292,8 @@
 
     "@douglowder/expo-av-route-picker-view": ["@douglowder/expo-av-route-picker-view@0.0.5", "", { "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-oT4wf8aYYNfLEuZEkwZIH7CtEHKnEHWnjs6/hNwbFGEC0FnfjjWBNrQEt4fo5/gkafqa2G5ILkxndMyBZvk5dg=="],
 
+    "@egjs/hammerjs": ["@egjs/hammerjs@2.0.17", "", { "dependencies": { "@types/hammerjs": "^2.0.36" } }, "sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A=="],
+
     "@epic-web/invariant": ["@epic-web/invariant@1.0.0", "", {}, "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA=="],
 
     "@expo-google-fonts/material-symbols": ["@expo-google-fonts/material-symbols@0.4.38", "", {}, "sha512-IJkBtN1o8u9BW5fvSii1MyHPQ7Q0HxbWcVBvOrOzgMLpVtZw7R2w94wBTVR7kZwv3w1JNTESMmLA5Sqn1+Z36A=="],
@@ -586,6 +588,8 @@
 
     "@types/emscripten": ["@types/emscripten@1.41.5", "", {}, "sha512-cMQm7pxu6BxtHyqJ7mQZ2kXWV5SLmugybFdHCBbJ5eHzOo6VhBckEgAT3//rP5FwPHNPeEiq4SmQ5ucBwsOo4Q=="],
 
+    "@types/hammerjs": ["@types/hammerjs@2.0.46", "", {}, "sha512-ynRvcq6wvqexJ9brDMS4BnBLzmr0e14d6ZJTEShTBWKymQiHwlAyGu0ZPEFI2Fh1U53F7tN9ufClWM5KvqkKOw=="],
+
     "@types/hoist-non-react-statics": ["@types/hoist-non-react-statics@3.3.7", "", { "dependencies": { "hoist-non-react-statics": "^3.3.0" }, "peerDependencies": { "@types/react": "*" } }, "sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g=="],
 
     "@types/istanbul-lib-coverage": ["@types/istanbul-lib-coverage@2.0.6", "", {}, "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="],
@@ -1524,11 +1528,11 @@
 
     "raw-body": ["raw-body@3.0.2", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.7.0", "unpipe": "~1.0.0" } }, "sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA=="],
 
-    "react": ["react@19.2.3", "", {}, "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA=="],
+    "react": ["react@19.2.6", "", {}, "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q=="],
 
     "react-devtools-core": ["react-devtools-core@6.1.5", "", { "dependencies": { "shell-quote": "^1.6.1", "ws": "^7" } }, "sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA=="],
 
-    "react-dom": ["react-dom@19.2.3", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.3" } }, "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg=="],
+    "react-dom": ["react-dom@19.2.6", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.6" } }, "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g=="],
 
     "react-fast-compare": ["react-fast-compare@3.2.2", "", {}, "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="],
 
@@ -1558,7 +1562,7 @@
 
     "react-native-edge-to-edge": ["react-native-edge-to-edge@1.8.1", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-bhvsKqeX9PGkY9wBUk9vni/tJNJdKtLPbs/j3e/3CdV4JmUWfTXYYoL+4Hc8Wmej+5eJxkc8KOFa454ruFWBCA=="],
 
-    "react-native-gesture-handler": ["react-native-gesture-handler@3.0.0", "", { "dependencies": { "@types/react-test-renderer": "^19.1.0", "invariant": "^2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-6E8o9D2sHwhFGiU0c4aCweMdJwIbQeBV+dq3IQ3HcqKhVGzg7ccEycap6i0zGCtIYfs3V29Xd4OycwcRj5qxBQ=="],
+    "react-native-gesture-handler": ["react-native-gesture-handler@2.31.2", "", { "dependencies": { "@egjs/hammerjs": "^2.0.17", "@types/react-test-renderer": "^19.1.0", "hoist-non-react-statics": "^3.3.0", "invariant": "^2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-rw5q74i2AfS7YGYdbxQDhOU7xqgY6WRM1132/CCm3erqjblhECZDZFHIm0tteHoC9ih24wogVBVVzcTBQtZ+5A=="],
 
     "react-native-glass-effect-view": ["react-native-glass-effect-view@1.0.0", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-ABYG0oIiqbXsxe2R/cMhNgDn3YgwDLz/2TIN2XOxQopXC+MiGsG9C32VYQvO2sYehcu5JmI3h3EzwLwl6lJhhA=="],
 
@@ -1592,7 +1596,7 @@
 
     "react-native-text-ticker": ["react-native-text-ticker@1.15.0", "", {}, "sha512-d/uK+PIOhsYMy1r8h825iq/nADiHsabz3WMbRJSnkpQYn+K9aykUAXRRhu8ZbTAzk4CgnUWajJEFxS5ZDygsdg=="],
 
-    "react-native-track-player": ["react-native-track-player@github:lovegaoshi/react-native-track-player#33a3ecd", { "peerDependencies": { "react": "*", "react-native": "*", "react-native-windows": "*", "shaka-player": "^4.7.9" }, "optionalPeers": ["react-native-windows", "shaka-player"] }, "lovegaoshi-react-native-track-player-33a3ecd", "sha512-vfkld2jUj7EPkAjIc/Vbx4Q4MtOOLmYtCYCE2dWJsyLnPqgj1f0xVzBxbeVP7dfT+eSh4KIXfdxESXaHgrXIlw=="],
+    "react-native-track-player": ["react-native-track-player@github:lovegaoshi/react-native-track-player#33a3ecd", { "peerDependencies": { "react": "*", "react-native": "*", "react-native-windows": "*", "shaka-player": "^4.7.9" }, "optionalPeers": ["react-native-windows", "shaka-player"] }, "lovegaoshi-react-native-track-player-33a3ecd"],
 
     "react-native-udp": ["react-native-udp@4.1.7", "", { "dependencies": { "buffer": "^5.6.0", "events": "^3.1.0" } }, "sha512-NUE3zewu61NCdSsLlj+l0ad6qojcVEZPT4hVG/x6DU9U4iCzwtfZSASh9vm7teAcVzLkdD+cO3411LHshAi/wA=="],
 
@@ -1614,7 +1618,7 @@
 
     "react-style-singleton": ["react-style-singleton@2.2.3", "", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="],
 
-    "react-test-renderer": ["react-test-renderer@19.2.3", "", { "dependencies": { "react-is": "^19.2.3", "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.3" } }, "sha512-TMR1LnSFiWZMJkCgNf5ATSvAheTT2NvKIwiVwdBPHxjBI7n/JbWd4gaZ16DVd9foAXdvDz+sB5yxZTwMjPRxpw=="],
+    "react-test-renderer": ["react-test-renderer@19.2.6", "", { "dependencies": { "react-is": "^19.2.6", "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.6" } }, "sha512-GbS6V23YduFTPiWJ5xICbKEjRcqx1Z90js/V5miqhz7qp/d6xSe9Dd6NjSQODFRdzdsqRMPW82E/sFpPRbY5Mw=="],
 
     "read-cache": ["read-cache@1.0.0", "", { "dependencies": { "pify": "^2.3.0" } }, "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="],
 

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MPVLayerRenderer.kt

@@ -236,43 +236,37 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     }
     
     /**
-     * Attach surface and ensure video output is active.
+     * Attach surface and re-enable video output.
-     *
+     * Based on Findroid's implementation.
-     * During PiP transitions, the surface is destroyed and recreated by Android.
-     * We keep the VO pipeline alive (not killed with vo=null) so that rendering
-     * resumes immediately when the new surface is attached — avoiding the black
-     * screen that occurs when the VO is fully re-initialized via setOptionString.
      */
     fun attachSurface(surface: Surface) {
         this.surface = surface
-        Log.i(TAG, "[PiP] attachSurface — isRunning=$isRunning, vo=$voDriver, surface=${surface.hashCode()}")
         if (isRunning) {
             MPVLib.attachSurface(surface)
+            // Re-enable video output after attaching surface (Findroid approach)
             MPVLib.setOptionString("force-window", "yes")
-            // Read back vo to confirm it's still active
+            MPVLib.setOptionString("vo", voDriver)
-            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
+            Log.i(TAG, "Surface attached, video output re-enabled (vo=$voDriver)")
-            Log.i(TAG, "[PiP] attachSurface — attached, activeVo=$activeVo")
         }
     }
-
+    
     /**
-     * Detach surface without killing the VO pipeline.
+     * Detach surface and disable video output.
-     *
+     * Based on Findroid's implementation.
-     * The previous approach (vo=null / force-window=no) destroyed the entire video
-     * output pipeline on every surface transition. During PiP mode, the rapid
-     * destroy/recreate cycle caused a black screen because setOptionString("vo", ...)
-     * did not properly re-initialize rendering into the new PiP surface.
-     *
-     * By keeping the VO alive, frames are simply dropped while no surface is
-     * attached, and rendering resumes immediately when the new surface arrives.
      */
     fun detachSurface() {
         this.surface = null
-        Log.i(TAG, "[PiP] detachSurface — isRunning=$isRunning, vo=$voDriver")
         if (isRunning) {
+            try {
+                // Disable video output before detaching surface (Findroid approach)
+                MPVLib.setOptionString("vo", "null")
+                MPVLib.setOptionString("force-window", "no")
+                Log.i(TAG, "Video output disabled before surface detach")
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to disable video output: ${e.message}")
+            }
+            
             MPVLib.detachSurface()
-            val activeVo = try { MPVLib.getPropertyString("vo") } catch (e: Exception) { null }
-            Log.i(TAG, "[PiP] detachSurface — detached, activeVo=$activeVo (should still be $voDriver)")
         }
     }
     
@@ -283,24 +277,7 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
     fun updateSurfaceSize(width: Int, height: Int) {
         if (isRunning) {
             MPVLib.setPropertyString("android-surface-size", "${width}x$height")
-            Log.i(TAG, "[PiP] updateSurfaceSize — ${width}x${height}")
+            Log.i(TAG, "Surface size updated: ${width}x$height")
-        } else {
-            Log.w(TAG, "[PiP] updateSurfaceSize — called but renderer not running")
-        }
-    }
-
-    /**
-     * Force mpv to render a frame to the current surface.
-     * Steps forward one frame then seeks back to the original position.
-     * Used after PiP entry to work around mpv stopping pixel output.
-     */
-    fun forceRedraw() {
-        if (!isRunning) return
-        val pos = cachedPosition
-        Log.i(TAG, "[PiP] forceRedraw — stepping frame then seeking to $pos")
-        MPVLib.command(arrayOf("frame-step"))
-        if (pos > 0) {
-            MPVLib.command(arrayOf("seek", pos.toString(), "absolute"))
         }
     }
     

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerModule.kt

@@ -198,7 +198,7 @@ class MpvPlayerModule : Module() {
             }
 
             // Defines events that the view can send to JavaScript
-            Events("onLoad", "onPlaybackStateChange", "onProgress", "onError", "onTracksReady", "onPictureInPictureChange")
+            Events("onLoad", "onPlaybackStateChange", "onProgress", "onError", "onTracksReady")
         }
     }
 }

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerView.kt

@@ -2,15 +2,12 @@ package expo.modules.mpvplayer
 
 import android.content.Context
 import android.graphics.Color
-import android.graphics.Rect
+import android.os.Build
-import android.graphics.SurfaceTexture
-import android.os.Handler
-import android.os.Looper
 import android.util.Log
 import android.view.Surface
-import android.view.TextureView
+import android.view.SurfaceHolder
-import android.view.View
+import android.view.SurfaceView
-import android.view.ViewGroup
+import android.widget.FrameLayout
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -31,27 +28,26 @@ data class VideoLoadConfig(
 
 /**
  * MpvPlayerView - ExpoView that hosts the MPV player.
- * Uses TextureView for reliable Picture-in-Picture support.
+ * This mirrors the iOS MpvPlayerView implementation.
  */
-class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context, appContext),
+class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context, appContext), 
-    MPVLayerRenderer.Delegate, TextureView.SurfaceTextureListener {
+    MPVLayerRenderer.Delegate, SurfaceHolder.Callback {
-
+    
     companion object {
         private const val TAG = "MpvPlayerView"
     }
-
+    
     // Event dispatchers
     val onLoad by EventDispatcher()
     val onPlaybackStateChange by EventDispatcher()
     val onProgress by EventDispatcher()
     val onError by EventDispatcher()
     val onTracksReady by EventDispatcher()
-    val onPictureInPictureChange by EventDispatcher()
+    
-
+    private var surfaceView: SurfaceView
-    private var textureView: TextureView
     private var renderer: MPVLayerRenderer? = null
     private var pipController: PiPController? = null
-
+    
     private var currentUrl: String? = null
     private var cachedPosition: Double = 0.0
     private var cachedDuration: Double = 0.0
@@ -60,29 +56,23 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     private var pendingConfig: VideoLoadConfig? = null
     private var rendererStarted: Boolean = false
     private var pendingSurface: Surface? = null
-    private var surfaceTexture: SurfaceTexture? = null
-
-    // PiP state tracking
-    private var isWaitingForPiPTransition: Boolean = false
-    private var isPiPSurfaceForced: Boolean = false
-    private val pipHandler = Handler(Looper.getMainLooper())
 
     init {
         setBackgroundColor(Color.BLACK)
 
-        // Create TextureView for video rendering (composites into app window for PiP support)
+        // Create SurfaceView for video rendering
-        textureView = TextureView(context).apply {
+        surfaceView = SurfaceView(context).apply {
-            layoutParams = ViewGroup.LayoutParams(
+            layoutParams = FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT
+                FrameLayout.LayoutParams.MATCH_PARENT
             )
-            surfaceTextureListener = this@MpvPlayerView
+            holder.addCallback(this@MpvPlayerView)
         }
-        addView(textureView)
+        addView(surfaceView)
 
         // Initialize PiP controller with Expo's AppContext for proper activity access
         pipController = PiPController(context, appContext)
-        pipController?.setPlayerView(textureView)
+        pipController?.setPlayerView(surfaceView)
         pipController?.delegate = object : PiPController.Delegate {
             override fun onPlay() {
                 play()
@@ -95,23 +85,6 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             override fun onSeekBy(seconds: Double) {
                 seekBy(seconds)
             }
-
-            override fun onPictureInPictureModeChanged(isInPiP: Boolean) {
-                if (isInPiP) {
-                    if (!isWaitingForPiPTransition) {
-                        isWaitingForPiPTransition = true
-                        pipHandler.removeCallbacksAndMessages(null)
-                        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
-                            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
-                        }
-                    }
-                } else {
-                    isWaitingForPiPTransition = false
-                    pipHandler.removeCallbacksAndMessages(null)
-                    restoreFromPiP()
-                }
-                onPictureInPictureChange(mapOf("isActive" to isInPiP))
-            }
         }
 
         // Renderer is created lazily in loadVideo once we have the voDriver setting
@@ -129,29 +102,32 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         try {
             renderer?.start(voDriver ?: "gpu-next")
             rendererStarted = true
+            Log.i(TAG, "Renderer started with vo=$voDriver")
 
+            // If surface was created before renderer started, attach it now
             pendingSurface?.let { surface ->
                 renderer?.attachSurface(surface)
                 pendingSurface = null
+                Log.i(TAG, "Attached pending surface after renderer start")
             }
         } catch (e: Exception) {
             Log.e(TAG, "Failed to start renderer: ${e.message}")
             onError(mapOf("error" to "Failed to start renderer: ${e.message}"))
         }
     }
-
+    
-    // MARK: - TextureView.SurfaceTextureListener
+    // MARK: - SurfaceHolder.Callback
-
+    
-    override fun onSurfaceTextureAvailable(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+    override fun surfaceCreated(holder: SurfaceHolder) {
-        this.surfaceTexture = surfaceTexture
+        Log.i(TAG, "Surface created")
-        val surface = Surface(surfaceTexture)
-        surfaceTexture.setDefaultBufferSize(width, height)
         surfaceReady = true
 
         if (rendererStarted) {
-            renderer?.attachSurface(surface)
+            renderer?.attachSurface(holder.surface)
         } else {
-            pendingSurface = surface
+            // Renderer not started yet - store surface to attach after start
+            pendingSurface = holder.surface
+            Log.i(TAG, "Surface created before renderer started, storing as pending")
         }
 
         // If we have a pending load, execute it now
@@ -161,23 +137,19 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             pendingConfig = null
         }
     }
-
+    
-    override fun onSurfaceTextureSizeChanged(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
+    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-        surfaceTexture.setDefaultBufferSize(width, height)
+        Log.i(TAG, "Surface changed: ${width}x${height}")
+        // Update MPV with the new surface size (Findroid approach)
         renderer?.updateSurfaceSize(width, height)
     }
-
+    
-    override fun onSurfaceTextureDestroyed(surfaceTexture: SurfaceTexture): Boolean {
+    override fun surfaceDestroyed(holder: SurfaceHolder) {
-        this.surfaceTexture = null
+        Log.i(TAG, "Surface destroyed")
         surfaceReady = false
         renderer?.detachSurface()
-        return false // mpv manages the SurfaceTexture
     }
-
+    
-    override fun onSurfaceTextureUpdated(surfaceTexture: SurfaceTexture) {
-        // Called every frame — no action needed, mpv drives rendering directly
-    }
-
     // MARK: - Video Loading
 
     fun loadVideo(config: VideoLoadConfig) {
@@ -197,10 +169,10 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
         loadVideoInternal(config)
     }
-
+    
     private fun loadVideoInternal(config: VideoLoadConfig) {
         currentUrl = config.url
-
+        
         renderer?.load(
             url = config.url,
             headers = config.headers,
@@ -209,173 +181,124 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             initialSubtitleId = config.initialSubtitleId,
             initialAudioId = config.initialAudioId
         )
-
+        
         if (config.autoplay) {
             play()
         }
-
+        
         onLoad(mapOf("url" to config.url))
     }
-
+    
     // Convenience method for simple loads
     fun loadVideo(url: String, headers: Map<String, String>? = null) {
         loadVideo(VideoLoadConfig(url = url, headers = headers))
     }
-
+    
     // MARK: - Playback Controls
-
+    
     fun play() {
         intendedPlayState = true
         renderer?.play()
         pipController?.setPlaybackRate(1.0)
     }
-
+    
     fun pause() {
         intendedPlayState = false
         renderer?.pause()
         pipController?.setPlaybackRate(0.0)
     }
-
+    
     fun seekTo(position: Double) {
         renderer?.seekTo(position)
     }
-
+    
     fun seekBy(offset: Double) {
         renderer?.seekBy(offset)
     }
-
+    
     fun setSpeed(speed: Double) {
         renderer?.setSpeed(speed)
     }
-
+    
     fun getSpeed(): Double {
         return renderer?.getSpeed() ?: 1.0
     }
-
+    
     fun isPaused(): Boolean {
         return renderer?.isPausedState ?: true
     }
-
+    
     fun getCurrentPosition(): Double {
         return cachedPosition
     }
-
+    
     fun getDuration(): Double {
         return cachedDuration
     }
-
+    
     // MARK: - Picture in Picture
-
+    
     fun startPictureInPicture() {
-        isWaitingForPiPTransition = true
+        Log.i(TAG, "startPictureInPicture called")
         pipController?.startPictureInPicture()
-
-        // Resize buffer to match PiP window after animation settles
-        pipHandler.removeCallbacksAndMessages(null)
-        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
-            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
-        }
     }
-
+    
-    /**
-     * Resize the SurfaceTexture buffer AND TextureView layout to match the PiP
-     * visible rect so mpv renders at the PiP window's actual dimensions.
-     */
-    private fun forcePiPBufferSize() {
-        if (!isWaitingForPiPTransition || !surfaceReady) return
-
-        val rect = Rect()
-        textureView.getGlobalVisibleRect(rect)
-        val visW = rect.width()
-        val visH = rect.height()
-        val vw = textureView.width
-        val vh = textureView.height
-
-        if (visW <= 0 || visH <= 0 || (vw == visW && vh == visH)) return
-
-        surfaceTexture?.setDefaultBufferSize(visW, visH)
-        renderer?.updateSurfaceSize(visW, visH)
-
-        // Force TextureView layout to match PiP visible area.
-        // layoutParams alone doesn't work during PiP because the parent
-        // never re-lays out its children.
-        textureView.measure(
-            View.MeasureSpec.makeMeasureSpec(visW, View.MeasureSpec.EXACTLY),
-            View.MeasureSpec.makeMeasureSpec(visH, View.MeasureSpec.EXACTLY)
-        )
-        textureView.layout(0, 0, visW, visH)
-        isPiPSurfaceForced = true
-    }
-
-    private fun restoreFromPiP() {
-        if (!isPiPSurfaceForced) return
-        isPiPSurfaceForced = false
-
-        val lp = textureView.layoutParams
-        lp.width = ViewGroup.LayoutParams.MATCH_PARENT
-        lp.height = ViewGroup.LayoutParams.MATCH_PARENT
-        textureView.layoutParams = lp
-        textureView.requestLayout()
-    }
-
     fun stopPictureInPicture() {
-        isWaitingForPiPTransition = false
-        pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
     }
-
+    
     fun isPictureInPictureSupported(): Boolean {
         return pipController?.isPictureInPictureSupported() ?: false
     }
-
+    
     fun isPictureInPictureActive(): Boolean {
         return pipController?.isPictureInPictureActive() ?: false
     }
-
+    
     // MARK: - Subtitle Controls
-
+    
     fun getSubtitleTracks(): List<Map<String, Any>> {
         return renderer?.getSubtitleTracks() ?: emptyList()
     }
-
+    
     fun setSubtitleTrack(trackId: Int) {
         renderer?.setSubtitleTrack(trackId)
     }
-
+    
     fun disableSubtitles() {
         renderer?.disableSubtitles()
     }
-
+    
     fun getCurrentSubtitleTrack(): Int {
         return renderer?.getCurrentSubtitleTrack() ?: 0
     }
-
+    
     fun addSubtitleFile(url: String, select: Boolean = true) {
         renderer?.addSubtitleFile(url, select)
     }
-
+    
     // MARK: - Subtitle Positioning
-
+    
     fun setSubtitlePosition(position: Int) {
         renderer?.setSubtitlePosition(position)
     }
-
+    
     fun setSubtitleScale(scale: Double) {
         renderer?.setSubtitleScale(scale)
     }
-
+    
     fun setSubtitleMarginY(margin: Int) {
         renderer?.setSubtitleMarginY(margin)
     }
-
+    
     fun setSubtitleAlignX(alignment: String) {
         renderer?.setSubtitleAlignX(alignment)
     }
-
+    
     fun setSubtitleAlignY(alignment: String) {
         renderer?.setSubtitleAlignY(alignment)
     }
-
+    
     fun setSubtitleFontSize(size: Int) {
         renderer?.setSubtitleFontSize(size)
     }
@@ -393,15 +316,15 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     }
 
     // MARK: - Audio Track Controls
-
+    
     fun getAudioTracks(): List<Map<String, Any>> {
         return renderer?.getAudioTracks() ?: emptyList()
     }
-
+    
     fun setAudioTrack(trackId: Int) {
         renderer?.setAudioTrack(trackId)
     }
-
+    
     fun getCurrentAudioTrack(): Int {
         return renderer?.getCurrentAudioTrack() ?: 0
     }
@@ -426,16 +349,16 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     }
 
     // MARK: - MPVLayerRenderer.Delegate
-
+    
     override fun onPositionChanged(position: Double, duration: Double, cacheSeconds: Double) {
         cachedPosition = position
         cachedDuration = duration
-
+        
         // Update PiP progress
         if (pipController?.isPictureInPictureActive() == true) {
             pipController?.setCurrentTime(position, duration)
         }
-
+        
         onProgress(mapOf(
             "position" to position,
             "duration" to duration,
@@ -443,51 +366,50 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             "cacheSeconds" to cacheSeconds
         ))
     }
-
+    
     override fun onPauseChanged(isPaused: Boolean) {
+        // Sync PiP playback rate
         pipController?.setPlaybackRate(if (isPaused) 0.0 else 1.0)
-
+        
         onPlaybackStateChange(mapOf(
             "isPaused" to isPaused,
             "isPlaying" to !isPaused
         ))
     }
-
+    
     override fun onLoadingChanged(isLoading: Boolean) {
         onPlaybackStateChange(mapOf(
             "isLoading" to isLoading
         ))
     }
-
+    
     override fun onReadyToSeek() {
         onPlaybackStateChange(mapOf(
             "isReadyToSeek" to true
         ))
     }
-
+    
     override fun onTracksReady() {
         onTracksReady(emptyMap<String, Any>())
     }
-
+    
     override fun onVideoDimensionsChanged(width: Int, height: Int) {
+        // Update PiP controller with video dimensions for proper aspect ratio
         pipController?.setVideoDimensions(width, height)
     }
-
+    
     override fun onError(message: String) {
         onError(mapOf("error" to message))
     }
-
+    
     // MARK: - Cleanup
-
+    
     fun cleanup() {
-        isWaitingForPiPTransition = false
-        pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
         renderer?.stop()
-        surfaceTexture = null
+        surfaceView.holder.removeCallback(this)
-        surfaceReady = false
     }
-
+    
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
         cleanup()

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/PiPController.kt

@@ -1,62 +1,51 @@
 package expo.modules.mpvplayer
 
 import android.app.Activity
-import android.app.Application
 import android.app.PictureInPictureParams
-import android.app.RemoteAction
-import android.content.BroadcastReceiver
 import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
 import android.content.pm.PackageManager
-import android.graphics.drawable.Icon
 import android.graphics.Rect
 import android.os.Build
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.util.Log
 import android.util.Rational
 import android.view.View
 import androidx.annotation.RequiresApi
 import expo.modules.kotlin.AppContext
 
+/**
+ * Picture-in-Picture controller for Android.
+ * This mirrors the iOS PiPController implementation.
+ */
 class PiPController(private val context: Context, private val appContext: AppContext? = null) {
-
+    
     companion object {
         private const val TAG = "PiPController"
         private const val DEFAULT_ASPECT_WIDTH = 16
         private const val DEFAULT_ASPECT_HEIGHT = 9
-        private const val ACTION_PIP_PLAY_PAUSE = "expo.modules.mpvplayer.PIP_PLAY_PAUSE"
-        private const val ACTION_PIP_SKIP_FORWARD = "expo.modules.mpvplayer.PIP_SKIP_FORWARD"
-        private const val ACTION_PIP_SKIP_BACKWARD = "expo.modules.mpvplayer.PIP_SKIP_BACKWARD"
     }
-
+    
     interface Delegate {
         fun onPlay()
         fun onPause()
         fun onSeekBy(seconds: Double)
-        fun onPictureInPictureModeChanged(isInPiP: Boolean)
     }
-
+    
     var delegate: Delegate? = null
-
+    
     private var currentPosition: Double = 0.0
     private var currentDuration: Double = 0.0
     private var playbackRate: Double = 1.0
-
+    
+    // Video dimensions for proper aspect ratio
     private var videoWidth: Int = 0
     private var videoHeight: Int = 0
+    
+    // Reference to the player view for source rect
     private var playerView: View? = null
-
+    
-    // PiP state tracking
+    /**
-    private var isInPiPMode: Boolean = false
+     * Check if Picture-in-Picture is supported on this device
-    private var pipEntryNotified: Boolean = false
+     */
-    private val pipHandler = Handler(Looper.getMainLooper())
-    private var lifecycleCallbacks: Application.ActivityLifecycleCallbacks? = null
-    private var lifecycleRegistered = false
-    private var pipBroadcastReceiver: BroadcastReceiver? = null
-
     fun isPictureInPictureSupported(): Boolean {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
@@ -64,7 +53,10 @@ class PiPController(private val context: Context, private val appContext: AppCon
             false
         }
     }
-
+    
+    /**
+     * Check if Picture-in-Picture is currently active
+     */
     fun isPictureInPictureActive(): Boolean {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val activity = getActivity()
@@ -72,69 +64,69 @@ class PiPController(private val context: Context, private val appContext: AppCon
         }
         return false
     }
-
+    
+    /**
+     * Start Picture-in-Picture mode
+     */
     fun startPictureInPicture() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-
+            val activity = getActivity()
-        val activity = getActivity() ?: run {
+            if (activity == null) {
-            Log.e(TAG, "Cannot start PiP: no activity")
+                Log.e(TAG, "Cannot start PiP: no activity found")
-            return
-        }
-
-        if (!isPictureInPictureSupported()) {
-            Log.e(TAG, "PiP not supported on this device")
-            return
-        }
-
-        try {
-            val params = buildPiPParams(forEntering = true)
-            val result = activity.enterPictureInPictureMode(params)
-
-            if (!result) {
-                Log.e(TAG, "enterPictureInPictureMode rejected by system")
-                isInPiPMode = false
                 return
             }
-
+            
-            isInPiPMode = true
+            if (!isPictureInPictureSupported()) {
-            pipEntryNotified = true
+                Log.e(TAG, "PiP not supported on this device")
-            delegate?.onPictureInPictureModeChanged(true)
+                return
-            registerLifecycleCallbacks()
+            }
-        } catch (e: Exception) {
+            
-            Log.e(TAG, "Failed to enter PiP: ${e.message}")
+            try {
+                val params = buildPiPParams(forEntering = true)
+                activity.enterPictureInPictureMode(params)
+                Log.i(TAG, "Entered PiP mode")
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to enter PiP: ${e.message}")
+            }
+        } else {
+            Log.w(TAG, "PiP requires Android O or higher")
         }
     }
-
+    
+    /**
+     * Stop Picture-in-Picture mode
+     */
     fun stopPictureInPicture() {
-        isInPiPMode = false
+        // On Android, exiting PiP is typically done by the user
-        pipEntryNotified = false
+        // or by finishing the activity. We can request to move task to back.
-        unregisterLifecycleCallbacks()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val activity = getActivity()
             if (activity?.isInPictureInPictureMode == true) {
+                // Move task to back which will exit PiP
                 activity.moveTaskToBack(false)
             }
         }
     }
-
+    
-    fun isCurrentlyInPiP(): Boolean = isInPiPMode
+    /**
-
+     * Update the current playback position and duration
+     * Note: We don't update PiP params here as we're not using progress in PiP controls
+     */
     fun setCurrentTime(position: Double, duration: Double) {
         currentPosition = position
         currentDuration = duration
     }
-
+    
+    /**
+     * Set the playback rate (0.0 for paused, 1.0 for playing)
+     */
     fun setPlaybackRate(rate: Double) {
         playbackRate = rate
-
+        
-        if (rate > 0) {
+        // Update PiP params to reflect play/pause state
-            registerLifecycleCallbacks()
-        }
-
-        // Update PiP params so autoEnterEnabled and action icons track play/pause state
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val activity = getActivity()
-            if (activity != null) {
+            if (activity?.isInPictureInPictureMode == true) {
                 try {
                     activity.setPictureInPictureParams(buildPiPParams())
                 } catch (e: Exception) {
@@ -143,19 +135,28 @@ class PiPController(private val context: Context, private val appContext: AppCon
             }
         }
     }
-
+    
+    /**
+     * Set the video dimensions for proper aspect ratio calculation
+     */
     fun setVideoDimensions(width: Int, height: Int) {
         if (width > 0 && height > 0) {
             videoWidth = width
             videoHeight = height
+            Log.i(TAG, "Video dimensions set: ${width}x${height}")
+            
+            // Update PiP params if active
             updatePiPParamsIfNeeded()
         }
     }
-
+    
+    /**
+     * Set the player view reference for source rect hint
+     */
     fun setPlayerView(view: View?) {
         playerView = view
     }
-
+    
     private fun updatePiPParamsIfNeeded() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val activity = getActivity()
@@ -168,16 +169,23 @@ class PiPController(private val context: Context, private val appContext: AppCon
             }
         }
     }
-
+    
+    /**
+     * Build Picture-in-Picture params for the current player state.
+     * Calculates proper aspect ratio and source rect based on video and view dimensions.
+     */
     @RequiresApi(Build.VERSION_CODES.O)
     private fun buildPiPParams(forEntering: Boolean = false): PictureInPictureParams {
         val view = playerView
         val viewWidth = view?.width ?: 0
         val viewHeight = view?.height ?: 0
-
+        
+        // Display aspect ratio from view (exactly like Findroid)
         val displayAspectRatio = Rational(viewWidth.coerceAtLeast(1), viewHeight.coerceAtLeast(1))
-
+        
-        // Video aspect ratio with 2.39:1 clamping
+        // Video aspect ratio with 2.39:1 clamping (exactly like Findroid)
+        // Findroid: Rational(it.width.coerceAtMost((it.height * 2.39f).toInt()), 
+        //                    it.height.coerceAtMost((it.width * 2.39f).toInt()))
         val aspectRatio = if (videoWidth > 0 && videoHeight > 0) {
             Rational(
                 videoWidth.coerceAtMost((videoHeight * 2.39f).toInt()),
@@ -186,235 +194,70 @@ class PiPController(private val context: Context, private val appContext: AppCon
         } else {
             Rational(DEFAULT_ASPECT_WIDTH, DEFAULT_ASPECT_HEIGHT)
         }
-
+        
+        // Source rect hint calculation (exactly like Findroid)
         val sourceRectHint = if (viewWidth > 0 && viewHeight > 0 && videoWidth > 0 && videoHeight > 0) {
             if (displayAspectRatio < aspectRatio) {
+                // Letterboxing - black bars top/bottom
                 val space = ((viewHeight - (viewWidth.toFloat() / aspectRatio.toFloat())) / 2).toInt()
-                Rect(0, space, viewWidth, (viewWidth.toFloat() / aspectRatio.toFloat()).toInt() + space)
+                Rect(
+                    0,
+                    space,
+                    viewWidth,
+                    (viewWidth.toFloat() / aspectRatio.toFloat()).toInt() + space
+                )
             } else {
+                // Pillarboxing - black bars left/right
                 val space = ((viewWidth - (viewHeight.toFloat() * aspectRatio.toFloat())) / 2).toInt()
-                Rect(space, 0, (viewHeight.toFloat() * aspectRatio.toFloat()).toInt() + space, viewHeight)
+                Rect(
+                    space,
+                    0,
+                    (viewHeight.toFloat() * aspectRatio.toFloat()).toInt() + space,
+                    viewHeight
+                )
             }
         } else {
             null
         }
-
+        
         val builder = PictureInPictureParams.Builder()
             .setAspectRatio(aspectRatio)
-
+        
         sourceRectHint?.let { builder.setSourceRectHint(it) }
-
+        
-        ensurePiPReceiverRegistered()
+        // On Android 12+, enable auto-enter (like Findroid)
-        builder.setActions(buildPiPActions())
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            builder.setAutoEnterEnabled(forEntering || playbackRate > 0)
+            builder.setAutoEnterEnabled(true)
         }
-
+        
         return builder.build()
     }
-
+    
     private fun getActivity(): Activity? {
+        // First try Expo's AppContext (preferred in React Native)
         appContext?.currentActivity?.let { return it }
-
+        
+        // Fallback: Try to get from context wrapper chain
         var ctx = context
         while (ctx is android.content.ContextWrapper) {
-            if (ctx is Activity) return ctx
+            if (ctx is Activity) {
+                return ctx
+            }
             ctx = ctx.baseContext
         }
         return null
     }
-
+    
-    // MARK: - Lifecycle-based PiP Detection
+    /**
-
+     * Handle PiP action (called from activity when user taps PiP controls)
-    private fun registerLifecycleCallbacks() {
+     */
-        if (lifecycleRegistered) return
+    fun handlePiPAction(action: String) {
-
+        when (action) {
-        val app = context.applicationContext as? Application ?: run {
+            "play" -> delegate?.onPlay()
-            Log.w(TAG, "Cannot access Application for lifecycle callbacks, falling back to polling")
+            "pause" -> delegate?.onPause()
-            startFallbackPolling()
+            "skip_forward" -> delegate?.onSeekBy(10.0)
-            return
+            "skip_backward" -> delegate?.onSeekBy(-10.0)
         }
-
-        lifecycleCallbacks = object : Application.ActivityLifecycleCallbacks {
-            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
-            override fun onActivityStarted(activity: Activity) {}
-
-            override fun onActivityResumed(activity: Activity) {
-                if (!isInPiPMode) return
-                if (!activity.isInPictureInPictureMode) {
-                    isInPiPMode = false
-                    pipEntryNotified = false
-                    delegate?.onPictureInPictureModeChanged(false)
-                }
-            }
-
-            override fun onActivityPaused(activity: Activity) {
-                // Proactively hide controls when user leaves while playing,
-                // before the PiP window captures the UI. onActivityStopped
-                // will restore if PiP didn't actually enter.
-                if (playbackRate > 0 && !isInPiPMode) {
-                    isInPiPMode = true
-                    pipEntryNotified = true
-                    delegate?.onPictureInPictureModeChanged(true)
-                }
-            }
-
-            override fun onActivityStopped(activity: Activity) {
-                pipHandler.postDelayed({
-                    val inPip = activity.isInPictureInPictureMode
-
-                    if (inPip && !isInPiPMode) {
-                        isInPiPMode = true
-                        pipEntryNotified = true
-                        delegate?.onPictureInPictureModeChanged(true)
-                        return@postDelayed
-                    }
-
-                    if (!isInPiPMode) return@postDelayed
-                    if (inPip) return@postDelayed
-
-                    // Not in PiP after 1s — check again to avoid false positive during transition
-                    pipHandler.postDelayed({
-                        if (!isInPiPMode) return@postDelayed
-                        if (!activity.isInPictureInPictureMode) {
-                            isInPiPMode = false
-                            pipEntryNotified = false
-                            delegate?.onPictureInPictureModeChanged(false)
-                        }
-                    }, 1500)
-                }, 1000)
-            }
-
-            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
-
-            override fun onActivityDestroyed(activity: Activity) {
-                isInPiPMode = false
-            }
-        }
-
-        app.registerActivityLifecycleCallbacks(lifecycleCallbacks)
-        lifecycleRegistered = true
-    }
-
-    private fun unregisterLifecycleCallbacks() {
-        if (!lifecycleRegistered) return
-        lifecycleCallbacks?.let {
-            (context.applicationContext as? Application)
-                ?.unregisterActivityLifecycleCallbacks(it)
-        }
-        lifecycleCallbacks = null
-        lifecycleRegistered = false
-        pipHandler.removeCallbacksAndMessages(null)
-        unregisterPiPBroadcastReceiver()
-    }
-
-    private fun startFallbackPolling() {
-        var falseReadCount = 0
-        pipHandler.removeCallbacksAndMessages(null)
-        pipHandler.postDelayed(object : Runnable {
-            override fun run() {
-                if (!isInPiPMode) return
-
-                var ctx = context
-                var activity: Activity? = null
-                while (ctx is android.content.ContextWrapper) {
-                    if (ctx is Activity) { activity = ctx; break }
-                    ctx = ctx.baseContext
-                }
-
-                val stillInPip = activity?.isInPictureInPictureMode == true
-
-                if (!stillInPip) {
-                    falseReadCount++
-                    if (falseReadCount >= 3) {
-                        isInPiPMode = false
-                        delegate?.onPictureInPictureModeChanged(false)
-                        return
-                    }
-                    pipHandler.postDelayed(this, 500)
-                    return
-                }
-
-                falseReadCount = 0
-                pipHandler.postDelayed(this, 1000)
-            }
-        }, 3000)
-    }
-
-    // MARK: - PiP Remote Actions
-
-    private fun ensurePiPReceiverRegistered() {
-        if (pipBroadcastReceiver != null) return
-
-        pipBroadcastReceiver = object : BroadcastReceiver() {
-            override fun onReceive(context: Context, intent: Intent) {
-                when (intent.action) {
-                    ACTION_PIP_PLAY_PAUSE -> {
-                        if (playbackRate > 0) delegate?.onPause() else delegate?.onPlay()
-                    }
-                    ACTION_PIP_SKIP_FORWARD -> delegate?.onSeekBy(10.0)
-                    ACTION_PIP_SKIP_BACKWARD -> delegate?.onSeekBy(-10.0)
-                }
-            }
-        }
-
-        val filter = IntentFilter().apply {
-            addAction(ACTION_PIP_PLAY_PAUSE)
-            addAction(ACTION_PIP_SKIP_FORWARD)
-            addAction(ACTION_PIP_SKIP_BACKWARD)
-        }
-        val registerFlags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            Context.RECEIVER_EXPORTED
-        } else {
-            0
-        }
-        context.applicationContext.registerReceiver(pipBroadcastReceiver, filter, registerFlags)
-    }
-
-    private fun unregisterPiPBroadcastReceiver() {
-        pipBroadcastReceiver?.let {
-            try {
-                context.applicationContext.unregisterReceiver(it)
-            } catch (_: Exception) {}
-        }
-        pipBroadcastReceiver = null
-    }
-
-    private fun buildPiPActions(): List<RemoteAction> {
-        val isPlaying = playbackRate > 0
-
-        return listOf(
-            RemoteAction(
-                Icon.createWithResource(context, android.R.drawable.ic_media_rew),
-                "Rewind", "Skip backward 10 seconds",
-                createPiPPendingIntent(ACTION_PIP_SKIP_BACKWARD)
-            ),
-            RemoteAction(
-                Icon.createWithResource(
-                    context,
-                    if (isPlaying) android.R.drawable.ic_media_pause else android.R.drawable.ic_media_play
-                ),
-                if (isPlaying) "Pause" else "Play",
-                if (isPlaying) "Pause playback" else "Resume playback",
-                createPiPPendingIntent(ACTION_PIP_PLAY_PAUSE)
-            ),
-            RemoteAction(
-                Icon.createWithResource(context, android.R.drawable.ic_media_ff),
-                "Fast Forward", "Skip forward 10 seconds",
-                createPiPPendingIntent(ACTION_PIP_SKIP_FORWARD)
-            )
-        )
-    }
-
-    private fun createPiPPendingIntent(action: String): android.app.PendingIntent {
-        val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            android.app.PendingIntent.FLAG_IMMUTABLE
-        } else {
-            0
-        }
-        return android.app.PendingIntent.getBroadcast(
-            context.applicationContext, 0, Intent(action), flags
-        )
     }
 }
+

modules/mpv-player/ios/MpvPlayer.podspec

@@ -1,19 +1,32 @@
 Pod::Spec.new do |s|
-  s.name             = 'MpvPlayer'
+  s.name           = 'MpvPlayer'
-  s.version          = '1.0.0'
+  s.version        = '1.0.0'
-  s.summary          = 'MPV-based video player for Streamyfin (Expo module)'
+  s.summary        = 'MPVKit for Expo'
-  s.author           = 'Streamyfin'
+  s.description    = 'MPVKit for Expo'
-  s.homepage         = 'https://github.com/streamyfin/streamyfin'
+  s.author         = 'mpvkit'
-  s.platforms        = { :ios => '15.1', :tvos => '15.1' }
+  s.homepage       = 'https://github.com/mpvkit/MPVKit'
-  s.source           = { git: '' }
+  s.platforms      = {
+    :ios => '15.1',
+    :tvos => '15.1'
+  }
+  s.source         = { git: 'https://github.com/mpvkit/MPVKit.git' }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'MPVKit'
+  s.dependency 'MPVKit-GPL'
 
+  # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
-    'SWIFT_COMPILATION_MODE' => 'wholemodule'
+    'VALID_ARCHS' => 'arm64',
+    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386',
+    'DEBUG_INFORMATION_FORMAT' => 'dwarf',
+    'STRIP_INSTALLED_PRODUCT' => 'YES',
+    'DEPLOYMENT_POSTPROCESSING' => 'YES',
+  }
+
+  s.user_target_xcconfig = {
+    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386'
   }
 
   s.source_files = "*.{h,m,mm,swift,hpp,cpp}"

modules/mpv-player/src/MpvPlayer.types.ts

@@ -25,10 +25,6 @@ export type OnErrorEventPayload = {
 
 export type OnTracksReadyEventPayload = Record<string, never>;
 
-export type OnPictureInPictureChangePayload = {
-  isActive: boolean;
-};
-
 export type NowPlayingMetadata = {
   title?: string;
   artist?: string;
@@ -81,9 +77,6 @@ export type MpvPlayerViewProps = {
   onProgress?: (event: { nativeEvent: OnProgressEventPayload }) => void;
   onError?: (event: { nativeEvent: OnErrorEventPayload }) => void;
   onTracksReady?: (event: { nativeEvent: OnTracksReadyEventPayload }) => void;
-  onPictureInPictureChange?: (event: {
-    nativeEvent: OnPictureInPictureChangePayload;
-  }) => void;
 };
 
 export interface MpvPlayerViewRef {

modules/mpv-player/src/MpvPlayerView.tsx

@@ -7,8 +7,6 @@ import { MpvPlayerViewProps, MpvPlayerViewRef } from "./MpvPlayer.types";
 const NativeView: React.ComponentType<MpvPlayerViewProps & { ref?: any }> =
   requireNativeView("MpvPlayer");
 
-const PIP_LOG = "[PiP] MpvPlayerView.tsx:";
-
 export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
   function MpvPlayerView(props, ref) {
     const nativeRef = useRef<any>(null);
@@ -42,24 +40,16 @@ export default React.forwardRef<MpvPlayerViewRef, MpvPlayerViewProps>(
         return await nativeRef.current?.getDuration();
       },
       startPictureInPicture: async () => {
-        console.log(PIP_LOG, "startPictureInPicture → native");
         await nativeRef.current?.startPictureInPicture();
-        console.log(PIP_LOG, "startPictureInPicture ← native returned");
       },
       stopPictureInPicture: async () => {
-        console.log(PIP_LOG, "stopPictureInPicture → native");
         await nativeRef.current?.stopPictureInPicture();
-        console.log(PIP_LOG, "stopPictureInPicture ← native returned");
       },
       isPictureInPictureSupported: async () => {
-        const result = await nativeRef.current?.isPictureInPictureSupported();
+        return await nativeRef.current?.isPictureInPictureSupported();
-        console.log(PIP_LOG, "isPictureInPictureSupported =", result);
-        return result;
       },
       isPictureInPictureActive: async () => {
-        const result = await nativeRef.current?.isPictureInPictureActive();
+        return await nativeRef.current?.isPictureInPictureActive();
-        console.log(PIP_LOG, "isPictureInPictureActive =", result);
-        return result;
       },
       getSubtitleTracks: async () => {
         return await nativeRef.current?.getSubtitleTracks();

package.json

@@ -77,8 +77,8 @@
     "lodash": "4.18.1",
     "nativewind": "^2.0.11",
     "patch-package": "^8.0.0",
-    "react": "19.2.3",
+    "react": "19.2.6",
-    "react-dom": "19.2.3",
+    "react-dom": "19.2.6",
     "react-i18next": "17.0.8",
     "react-native": "npm:react-native-tvos@0.85.3-0",
     "react-native-awesome-slider": "^2.9.0",
@@ -89,7 +89,7 @@
     "react-native-device-info": "^15.0.0",
     "react-native-draggable-flatlist": "^4.0.3",
     "react-native-edge-to-edge": "^1.7.0",
-    "react-native-gesture-handler": "~3.0.0",
+    "react-native-gesture-handler": "~2.31.1",
     "react-native-glass-effect-view": "^1.0.0",
     "react-native-google-cast": "^4.9.1",
     "react-native-image-colors": "^2.4.0",
@@ -130,7 +130,7 @@
     "expo-doctor": "1.19.7",
     "husky": "9.1.7",
     "lint-staged": "17.0.5",
-    "react-test-renderer": "19.2.3",
+    "react-test-renderer": "19.2.6",
     "typescript": "5.9.3"
   },
   "expo": {