Fixed PiP aspect ratio and removed duplicated code.

app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt

@@ -172,7 +172,7 @@ abstract class AbstractPlayerFragment(
         canEnterPipMode = isPlayingRightNow && hasPipModeSupport
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             activity?.let { act ->
-                PlayerPipHelper.updatePIPModeActions(act, isPlayingRightNow)
+                PlayerPipHelper.updatePIPModeActions(act, isPlayingRightNow, player.getAspectRatio())
             }
         }
     }

app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt

@@ -5,6 +5,7 @@ import android.net.Uri
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.util.Rational
 import android.widget.FrameLayout
 import androidx.media3.common.C
 import androidx.preference.PreferenceManager
@@ -453,6 +454,12 @@ class CS3IPlayer : IPlayer {
         }
     }
 
+    override fun getAspectRatio(): Rational? {
+        return exoPlayer?.videoFormat?.let { format ->
+            Rational(format.width, format.height)
+        }
+    }
+
     override fun updateSubtitleStyle(style: SaveCaptionStyle) {
         subtitleHelper.setSubStyle(style)
     }

app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt

@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.content.Context
+import android.util.Rational
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -167,6 +168,19 @@ interface IPlayer {
 
     fun getVideoTracks(): CurrentTracks
 
+    /**
+     * Original video aspect ratio used for PiP mode
+     *
+     * Set using: Width, Height.
+     * Example: Rational(16, 9)
+     *
+     * If null will default to set no aspect ratio.
+     *
+     * PiP functions calling this needs to coerce this value between 0.418410 and 2.390000
+     * to prevent crashes.
+     */
+    fun getAspectRatio(): Rational?
+
     /** If no parameters are set it'll default to no set size, Specifying the id allows for track overrides to force the player to pick the quality. */
     fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE, id: String? = null)
 

app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt

@@ -7,28 +7,22 @@ import android.app.RemoteAction
 import android.content.Intent
 import android.graphics.drawable.Icon
 import android.os.Build
+import android.util.Rational
 import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import com.lagradost.cloudstream3.R
+import kotlin.math.roundToInt
 
 class PlayerPipHelper {
     companion object {
+        @RequiresApi(Build.VERSION_CODES.O)
         private fun getPen(activity: Activity, code: Int): PendingIntent {
-            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return PendingIntent.getBroadcast(
-                PendingIntent.getBroadcast(
+                activity,
-                    activity,
+                code,
-                    code,
+                Intent(ACTION_MEDIA_CONTROL).putExtra(EXTRA_CONTROL_TYPE, code),
-                    Intent("media_control").putExtra("control_type", code),
+                PendingIntent.FLAG_IMMUTABLE
-                    PendingIntent.FLAG_IMMUTABLE
+            )
-                )
-            } else {
-                PendingIntent.getBroadcast(
-                    activity,
-                    code,
-                    Intent("media_control").putExtra("control_type", code),
-                    PendingIntent.FLAG_IMMUTABLE
-                )
-            }
         }
 
         @RequiresApi(Build.VERSION_CODES.O)
@@ -48,7 +42,7 @@ class PlayerPipHelper {
         }
 
         @RequiresApi(Build.VERSION_CODES.O)
-        fun updatePIPModeActions(activity: Activity, isPlaying: Boolean) {
+        fun updatePIPModeActions(activity: Activity, isPlaying: Boolean, aspectRatio: Rational?) {
             val actions: ArrayList<RemoteAction> = ArrayList()
             actions.add(
                 getRemoteAction(
@@ -87,6 +81,17 @@ class PlayerPipHelper {
                     CSPlayerEvent.SeekForward
                 )
             )
+
+            // Nessecary to prevent crashing.
+            val mixAspectRatio = 0.41841f // ~1/2.39
+            val maxAspectRatio = 2.39f // widescreen standard
+            val ratioAccuracy = 100000 // To convert the float to int
+
+            // java.lang.IllegalArgumentException: setPictureInPictureParams: Aspect ratio is too extreme (must be between 0.418410 and 2.390000)
+            val fixedRational = aspectRatio?.toFloat()?.coerceIn(mixAspectRatio, maxAspectRatio)?.let {
+                Rational((it * ratioAccuracy).roundToInt(), ratioAccuracy)
+            }
+
             activity.setPictureInPictureParams(
                 PictureInPictureParams.Builder()
                     .apply {
@@ -95,6 +100,7 @@ class PlayerPipHelper {
                             setAutoEnterEnabled(isPlaying)
                         }
                     }
+                    .setAspectRatio(fixedRational)
                     .setActions(actions)
                     .build()
             )