@capgo/capacitor-video-player 8.1.19 → 8.1.20

package/README.md

@@ -115,6 +115,22 @@ await VideoPlayer.initPlayer({
 - Widevine DRM metadata is forwarded to the Cast media item. DRM-protected streams may still require a receiver that supports your license server and DRM flow.
 - Request headers used by the Android local player are not automatically available to the Chromecast receiver. Use public URLs, signed URLs, cookies supported by your receiver, or a custom receiver for secured media.
 
+## Android Picture in Picture
+
+Picture in Picture on Android requires your app activity to declare PiP support in `android/app/src/main/AndroidManifest.xml`:
+
+```xml
+<activity
+  android:name=".MainActivity"
+  android:supportsPictureInPicture="true"
+  android:launchMode="singleTask"
+  android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
+  ...>
+</activity>
+```
+
+`launchMode="singleTask"` and the `configChanges` flags prevent the player activity from being recreated when entering or leaving PiP.
+
 ## API
 
 <docgen-index>

package/android/src/main/java/com/capgo/videoplayer/FullscreenExoPlayerFragment.java

@@ -49,6 +49,7 @@ import com.getcapacitor.JSObject;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultLoadControl;
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.LoadControl;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.MediaMetadata;
@@ -132,6 +133,10 @@ public class FullscreenExoPlayerFragment extends Fragment {
     public JSObject drmOptions;
 
     private static final String TAG = FullscreenExoPlayerFragment.class.getName();
+    private static final Rational DEFAULT_PIP_ASPECT_RATIO = new Rational(16, 9);
+    // Android PiP aspect ratio must stay within [100/239, 239/100].
+    private static final Rational MIN_PIP_ASPECT_RATIO = new Rational(100, 239);
+    private static final Rational MAX_PIP_ASPECT_RATIO = new Rational(239, 100);
     public static final long UNKNOWN_TIME = -1L;
     private final List<String> supportedFormat = Arrays.asList(
         new String[] { "mp4", "webm", "ogv", "3gp", "flv", "dash", "mpd", "m3u8", "ism", "ytube", "" }
@@ -459,7 +464,9 @@ public class FullscreenExoPlayerFragment extends Fragment {
                             new View.OnClickListener() {
                                 @Override
                                 public void onClick(View view) {
-                                    pictureInPictureMode();
+                                    if (playerReady) {
+                                        pictureInPictureMode();
+                                    }
                                 }
                             }
                         );
@@ -595,35 +602,92 @@ public class FullscreenExoPlayerFragment extends Fragment {
      * Perform pictureInPictureMode Action
      */
     private void pictureInPictureMode() {
-        if (packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
-            styledPlayerView.setUseController(false);
-            styledPlayerView.setControllerAutoShow(false);
-            linearLayout.setVisibility(View.INVISIBLE);
-            Log.v(TAG, "PIP break 1");
-            // require android O or higher
-            if (
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
-            ) {
-                pictureInPictureParams = new PictureInPictureParams.Builder();
-                // setup height and width of the PIP window
-                Rational aspectRatio = new Rational(player.getVideoFormat().width, player.getVideoFormat().height);
-                pictureInPictureParams.setAspectRatio(aspectRatio).build();
-                getActivity().enterPictureInPictureMode(pictureInPictureParams.build());
-                Log.v(TAG, "PIP break 2");
+        Activity activity = getActivity();
+        if (
+            activity == null ||
+            player == null ||
+            !playerReady ||
+            !pipEnabled ||
+            !packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
+        ) {
+            return;
+        }
+
+        styledPlayerView.setUseController(false);
+        styledPlayerView.setControllerAutoShow(false);
+        linearLayout.setVisibility(View.INVISIBLE);
+
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                pictureInPictureParams = new PictureInPictureParams.Builder().setAspectRatio(getPipAspectRatio());
+                if (!activity.enterPictureInPictureMode(pictureInPictureParams.build())) {
+                    Log.w(TAG, "pictureInPictureMode: enterPictureInPictureMode returned false");
+                    restorePlayerUiAfterFailedPip();
+                    return;
+                }
             } else {
-                getActivity().enterPictureInPictureMode();
-                Log.v(TAG, "PIP break 3");
+                activity.enterPictureInPictureMode();
             }
-            isInPictureInPictureMode = getActivity().isInPictureInPictureMode();
+        } catch (IllegalArgumentException | IllegalStateException exception) {
+            Log.e(TAG, "pictureInPictureMode failed", exception);
+            restorePlayerUiAfterFailedPip();
+            Toast.makeText(context, "Unable to start Picture in Picture", Toast.LENGTH_SHORT).show();
+            return;
+        }
+
+        isInPictureInPictureMode = activity.isInPictureInPictureMode();
+        if (sturi != null) {
+            setSubtitle(true);
+        }
+        play();
+        handler.postDelayed(mRunnable, 100);
+    }
+
+    private void restorePlayerUiAfterFailedPip() {
+        linearLayout.setVisibility(View.INVISIBLE);
+        if (showControls) {
+            styledPlayerView.setUseController(true);
+            styledPlayerView.setControllerAutoShow(true);
+        }
+    }
+
+    private Rational getPipAspectRatio() {
+        if (player == null) {
+            return DEFAULT_PIP_ASPECT_RATIO;
+        }
+
+        Format videoFormat = player.getVideoFormat();
+        if (videoFormat == null || videoFormat.width <= 0 || videoFormat.height <= 0) {
+            return DEFAULT_PIP_ASPECT_RATIO;
+        }
+
+        Rational aspectRatio = new Rational(videoFormat.width, videoFormat.height);
+        if (aspectRatio.floatValue() < MIN_PIP_ASPECT_RATIO.floatValue()) {
+            return MIN_PIP_ASPECT_RATIO;
+        }
+        if (aspectRatio.floatValue() > MAX_PIP_ASPECT_RATIO.floatValue()) {
+            return MAX_PIP_ASPECT_RATIO;
+        }
+        return aspectRatio;
+    }
+
+    public void handlePictureInPictureModeChanged(boolean inPictureInPictureMode) {
+        isInPictureInPictureMode = inPictureInPictureMode;
+        if (inPictureInPictureMode) {
+            linearLayout.setVisibility(View.INVISIBLE);
+            styledPlayerView.setUseController(false);
             if (sturi != null) {
                 setSubtitle(true);
             }
-            if (player != null) play();
+            return;
+        }
 
-            handler.postDelayed(mRunnable, 100);
-            Log.v(TAG, "PIP break 4");
-        } else {
-            Log.v(TAG, "pictureInPictureMode: doesn't support PIP");
+        isPIPModeEnabled = true;
+        if (showControls) {
+            styledPlayerView.setUseController(true);
+        }
+        if (sturi != null) {
+            setSubtitle(false);
         }
     }
 
@@ -662,12 +726,17 @@ public class FullscreenExoPlayerFragment extends Fragment {
     @Override
     public void onStop() {
         super.onStop();
-        boolean isAppBackground = false;
-        if (bkModeEnabled) isAppBackground = isApplicationSentToBackground(context);
-        if (isInPictureInPictureMode) {
+        Activity activity = getActivity();
+        if (activity != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && activity.isInPictureInPictureMode()) {
+            isInPictureInPictureMode = true;
+            return;
+        }
+
+        if (isInPictureInPictureMode && activity != null) {
+            isInPictureInPictureMode = false;
             linearLayout.setVisibility(View.VISIBLE);
             playerExit();
-            getActivity().finishAndRemoveTask();
+            activity.finishAndRemoveTask();
         }
     }
 
@@ -1706,6 +1775,10 @@ public class FullscreenExoPlayerFragment extends Fragment {
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        Activity activity = getActivity();
+        if (activity != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            handlePictureInPictureModeChanged(activity.isInPictureInPictureMode());
+        }
         adjustAspectRatio();
     }
 

package/android/src/main/java/com/capgo/videoplayer/VideoPlayerPlugin.java

@@ -6,6 +6,7 @@ import android.app.UiModeManager;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.util.Log;
 import android.view.ViewGroup;
@@ -38,7 +39,7 @@ import java.util.Map;
 )
 public class VideoPlayerPlugin extends Plugin {
 
-    private final String pluginVersion = "8.1.19";
+    private final String pluginVersion = "8.1.20";
 
     // Permission alias constants
     private static final String PERMISSION_DENIED_ERROR = "Unable to access media videos, user denied permission request";
@@ -93,6 +94,14 @@ public class VideoPlayerPlugin extends Plugin {
         this.fragmentUtils = new FragmentUtils(getBridge());
     }
 
+    @Override
+    protected void handleOnConfigurationChanged(Configuration newConfig) {
+        super.handleOnConfigurationChanged(newConfig);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && fsFragment != null && getActivity() != null) {
+            fsFragment.handlePictureInPictureModeChanged(getActivity().isInPictureInPictureMode());
+        }
+    }
+
     @PermissionCallback
     private void permissionsCallback(PluginCall call) {
         if (!isPermissionsGranted()) {

package/ios/Sources/VideoPlayerPlugin/VideoPlayerPlugin.swift

@@ -8,7 +8,7 @@ import AVKit
  */
 @objc(VideoPlayerPlugin)
 public class VideoPlayerPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.1.19"
+    private let pluginVersion: String = "8.1.20"
     public let identifier = "VideoPlayerPlugin"
     public let jsName = "VideoPlayer"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-video-player",
-  "version": "8.1.19",
+  "version": "8.1.20",
   "description": "Capacitor plugin to play video in native player",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",