react-native-theoplayer 2.1.0 → 2.3.0

package/CHANGELOG.md

@@ -5,7 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased 2.1.0]
+## [2.3.0] - 23-04-14
+
+### Changed
+
+- Updated picture-in-picture controls on Android to include forward/rewind buttons and disabled pause button for ads.
+
+## [2.2.0] - 23-04-12
+
+### Fixed
+
+- Fixed an issue on Android and iOS where error codes were not correctly formatted.
+
+### Added
+
+- Added `RetryConfiguration` on `PlayerConfiguration` for Web and Android.
+
+### Changed
+
+- Set minimum THEOplayer dependency version to 5.0.1 for Web, iOS and Android.
+- Set `MediaPlaybackService` disabled by default on Android.
+
+## [2.1.0] - 23-04-09
 
 ### Fixed
 

package/android/build.gradle

@@ -105,7 +105,9 @@ dependencies {
   implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:4.8.0"
   implementation "androidx.appcompat:appcompat:1.4.+"
 
-  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '+')
+  // The minimum supported version is 5.0.1
+  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[5.0.1,)')
+
 //  def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', theoplayer_sdk_version)
   def theoplayer_mediasession_version = "4.12.0-local"
   def enabledV4 = theoplayer_sdk_version.toString().startsWith("4.")

package/android/src/main/AndroidManifest.xml

@@ -32,6 +32,7 @@
       android:name="com.theoplayer.audio.MediaPlaybackService"
       android:description="@string/background_playback_service_description"
       android:exported="false"
+      android:enabled="false"
       android:foregroundServiceType="mediaPlayback">
       <intent-filter>
         <action android:name="android.media.browse.MediaBrowserService" />

package/android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt

@@ -10,6 +10,7 @@ import com.theoplayer.android.api.ads.GoogleImaConfiguration
 import com.theoplayer.android.api.cast.CastStrategy
 import com.google.android.gms.cast.framework.CastContext
 import com.theoplayer.android.api.pip.PipConfiguration
+import com.theoplayer.android.api.player.NetworkConfiguration
 
 private const val TAG = "PlayerConfigAdapter"
 private const val PROP_ADS_CONFIGURATION = "ads"
@@ -24,6 +25,10 @@ private const val PROP_CAST_CONFIGURATION = "cast"
 private const val PROP_CAST_STRATEGY = "strategy"
 private const val PROP_CHROMECAST_CONFIG = "chromecast"
 private const val PROP_CHROMECAST_APPID = "appID"
+private const val PROP_RETRY_CONFIG = "retryConfiguration"
+private const val PROP_RETRY_MAX_RETRIES = "maxRetries"
+private const val PROP_RETRY_MIN_BACKOFF = "minimumBackoff"
+private const val PROP_RETRY_MAX_BACKOFF = "maximumBackoff"
 
 object PlayerConfigAdapter {
 
@@ -45,6 +50,12 @@ object PlayerConfigAdapter {
       if (configProps.hasKey(PROP_CHROMELESS)) {
         configBuilder.chromeless(configProps.getBoolean(PROP_CHROMELESS))
       }
+      if (configProps.hasKey(PROP_RETRY_CONFIG)) {
+        val networkConfig = networkConfigurationFromProps(configProps.getMap(PROP_RETRY_CONFIG))
+        if (networkConfig != null) {
+          configBuilder.networkConfiguration(networkConfig)
+        }
+      }
       applyCastConfigurationFromProps(configBuilder, configProps.getMap(PROP_CAST_CONFIGURATION))
       configBuilder.pipConfiguration(PipConfiguration.Builder().build())
     }
@@ -72,6 +83,23 @@ object PlayerConfigAdapter {
     return builder.build()
   }
 
+  private fun networkConfigurationFromProps(configProps: ReadableMap?): NetworkConfiguration? {
+    if (configProps == null) {
+      return null
+    }
+    val builder = NetworkConfiguration.Builder()
+    if (configProps.hasKey(PROP_RETRY_MAX_RETRIES)) {
+      builder.maxRetries(configProps.getInt(PROP_RETRY_MAX_RETRIES))
+    }
+    if (configProps.hasKey(PROP_RETRY_MIN_BACKOFF)) {
+      builder.minimumBackOff(configProps.getDouble(PROP_RETRY_MIN_BACKOFF).toLong())
+    }
+    if (configProps.hasKey(PROP_RETRY_MAX_BACKOFF)) {
+      builder.maximumBackOff(configProps.getDouble(PROP_RETRY_MAX_BACKOFF).toLong())
+    }
+    return builder.build()
+  }
+
   private fun applyCastConfigurationFromProps(
     configBuilder: THEOplayerConfig.Builder,
     castConfig: ReadableMap?

package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt

@@ -249,7 +249,7 @@ class PlayerEventEmitter internal constructor(
   }
 
   fun emitError(exception: THEOplayerException) {
-    emitError(exception.code.name, exception.message)
+    emitError(exception.code.id.toString(), exception.message)
   }
 
   fun emitPresentationModeChange(

package/android/src/main/java/com/theoplayer/presentation/PipUtils.kt

@@ -0,0 +1,244 @@
+package com.theoplayer.presentation
+
+import android.app.PendingIntent
+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.graphics.Rect
+import android.graphics.drawable.Icon
+import android.os.Build
+import android.util.Rational
+import android.view.SurfaceView
+import android.view.TextureView
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.RequiresApi
+import com.facebook.react.uimanager.ThemedReactContext
+import com.theoplayer.R
+import com.theoplayer.ReactTHEOplayerContext
+import com.theoplayer.android.api.ads.ima.GoogleImaAdEvent
+import com.theoplayer.android.api.ads.ima.GoogleImaAdEventType
+import com.theoplayer.android.api.event.EventListener
+import com.theoplayer.android.api.event.player.PlayerEvent
+import com.theoplayer.android.api.event.player.PlayerEventTypes
+import com.theoplayer.android.api.player.Player
+
+private const val EXTRA_ACTION = "EXTRA_ACTION"
+private const val ACTION_MEDIA_CONTROL = "pip_media_control"
+private const val ACTION_PLAY = 0
+private const val ACTION_PAUSE = ACTION_PLAY + 1
+private const val ACTION_RWD = ACTION_PLAY + 2
+private const val ACTION_FFD = ACTION_PLAY + 3
+private const val ACTION_IGNORE = ACTION_PLAY + 999
+private const val SKIP_TIME = 15
+
+private val PIP_ASPECT_RATIO_DEFAULT = Rational(16, 9)
+private val PIP_ASPECT_RATIO_MIN = Rational(100, 239)
+private val PIP_ASPECT_RATIO_MAX = Rational(239, 100)
+
+class PipUtils(
+  private val viewCtx: ReactTHEOplayerContext,
+  private val reactContext: ThemedReactContext
+) {
+
+  private var enabled: Boolean = false
+  private var onPlayerAction: EventListener<PlayerEvent<*>>? = null
+  private var onAdAction: EventListener<GoogleImaAdEvent>? = null
+  private val playerEvents = listOf(PlayerEventTypes.PLAY, PlayerEventTypes.PAUSE)
+  private val adEvents = listOf(GoogleImaAdEventType.STARTED, GoogleImaAdEventType.CONTENT_RESUME_REQUESTED)
+  private val broadcastReceiver: BroadcastReceiver = buildBroadcastReceiver()
+
+  private val player: Player
+    get() = viewCtx.player
+
+  init {
+    onPlayerAction = EventListener {
+      updatePipParams()
+    }
+    onAdAction = EventListener {
+      updatePipParams()
+    }
+  }
+
+  fun enable() {
+    if (enabled) {
+      return
+    }
+    playerEvents.forEach { action ->
+      player.addEventListener(action, onPlayerAction)
+    }
+    adEvents.forEach { action ->
+      player.ads.addEventListener(action, onAdAction)
+    }
+    reactContext.currentActivity?.registerReceiver(
+      broadcastReceiver,
+      IntentFilter(ACTION_MEDIA_CONTROL)
+    )
+    enabled = true
+  }
+
+  fun disable() {
+    if (!enabled) {
+      return
+    }
+    playerEvents.forEach { action ->
+      player.removeEventListener(action, onPlayerAction)
+    }
+    adEvents.forEach { action ->
+      player.ads.removeEventListener(action, onAdAction)
+    }
+    try {
+      reactContext.currentActivity?.unregisterReceiver(broadcastReceiver)
+    } catch (ignore: IllegalArgumentException) { /*ignore*/}
+    enabled = false
+  }
+
+  fun destroy() {
+    disable()
+  }
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  fun buildPipActions(
+    paused: Boolean,
+    enablePlayPause: Boolean,
+    enableTrickPlay: Boolean
+  ): List<RemoteAction> {
+    return mutableListOf<RemoteAction>().apply {
+
+      // Trick-play: Rewind
+      if (enableTrickPlay) {
+        add(
+          buildRemoteAction(
+            ACTION_RWD,
+            R.drawable.ic_rewind,
+            R.string.rwd_pip,
+            R.string.rwd_desc_pip
+          )
+        )
+      }
+
+      // Play/pause
+      // Always add this button, but send an ACTION_IGNORE if disabled.
+      add(
+        if (paused) {
+          buildRemoteAction(
+            if (enablePlayPause) ACTION_PLAY else ACTION_IGNORE,
+            R.drawable.ic_play,
+            R.string.play_pip,
+            R.string.play_desc_pip
+          )
+        } else {
+          buildRemoteAction(
+            if (enablePlayPause) ACTION_PAUSE else ACTION_IGNORE,
+            R.drawable.ic_pause,
+            R.string.pause_pip,
+            R.string.pause_desc_pip
+          )
+        }
+      )
+
+      // Trick-play: Fast Forward
+      if (enableTrickPlay) {
+        add(
+          buildRemoteAction(
+            ACTION_FFD,
+            R.drawable.ic_fast_forward,
+            R.string.ffd_pip,
+            R.string.ffd_desc_pip
+          )
+        )
+      }
+    }
+  }
+
+  private fun getSafeAspectRatio(width: Int, height: Int): Rational {
+    val aspectRatio = Rational(width, height)
+    if (aspectRatio.isNaN || aspectRatio.isInfinite || aspectRatio.isZero) {
+      // Default aspect ratio
+      return PIP_ASPECT_RATIO_DEFAULT
+    }
+    if (aspectRatio > PIP_ASPECT_RATIO_MAX) {
+      return PIP_ASPECT_RATIO_MAX
+    }
+    if (aspectRatio < PIP_ASPECT_RATIO_MIN) {
+      return PIP_ASPECT_RATIO_MIN
+    }
+    return aspectRatio
+  }
+
+  private fun getContentViewRect(view: ViewGroup): Rect? {
+    for (i in 0 until view.childCount) {
+      val child: View = view.getChildAt(i)
+      if (child is ViewGroup) {
+        return getContentViewRect(child)
+      } else if (child as? SurfaceView != null || child as? TextureView != null) {
+        val visibleRect = Rect()
+        child.getGlobalVisibleRect(visibleRect)
+        return visibleRect
+      }
+    }
+    return null
+  }
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  fun getPipParams(): PictureInPictureParams {
+    val view = viewCtx.playerView
+    val player = view.player
+    val visibleRect = getContentViewRect(view)
+    val isAd = player.ads.isPlaying
+    val isLive = player.duration.isInfinite()
+    val enablePlayPause = !isAd
+    val enableTrickPlay = !isAd && !isLive
+
+    return PictureInPictureParams.Builder()
+      .setSourceRectHint(visibleRect)
+      // Must be between 2.39:1 and 1:2.39 (inclusive)
+      .setAspectRatio(getSafeAspectRatio(view.player.videoWidth, view.player.videoHeight))
+      .setActions(
+        buildPipActions(player.isPaused, enablePlayPause, enableTrickPlay)
+      )
+      .build()
+  }
+
+  private fun updatePipParams() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      reactContext.currentActivity?.setPictureInPictureParams(getPipParams())
+    }
+  }
+
+  private fun buildBroadcastReceiver(): BroadcastReceiver {
+    return object : BroadcastReceiver() {
+      @RequiresApi(Build.VERSION_CODES.O)
+      override fun onReceive(context: Context?, intent: Intent?) {
+        intent?.getIntExtra(EXTRA_ACTION, -1)?.let { action ->
+          when (action) {
+            ACTION_PLAY -> player.play()
+            ACTION_PAUSE -> player.pause()
+            ACTION_FFD -> player.currentTime += SKIP_TIME
+            ACTION_RWD -> player.currentTime -= SKIP_TIME
+          }
+          reactContext.currentActivity?.setPictureInPictureParams(getPipParams())
+        }
+      }
+    }
+  }
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  private fun buildRemoteAction(
+    requestId: Int,
+    iconId: Int,
+    titleId: Int,
+    descId: Int
+  ): RemoteAction {
+    val intent = Intent(ACTION_MEDIA_CONTROL).putExtra(EXTRA_ACTION, requestId)
+    val pendingIntent =
+      PendingIntent.getBroadcast(reactContext, requestId, intent, PendingIntent.FLAG_IMMUTABLE)
+    val icon: Icon = Icon.createWithResource(reactContext, iconId)
+    val title = reactContext.getString(titleId)
+    val desc = reactContext.getString(descId)
+    return RemoteAction(icon, title, desc, pendingIntent)
+  }
+}

package/android/src/main/java/com/theoplayer/presentation/PresentationManager.kt

@@ -1,19 +1,12 @@
 package com.theoplayer.presentation
 
 import android.app.AppOpsManager
-import android.app.PictureInPictureParams
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
-import android.graphics.Rect
 import android.os.Build
-import android.util.Rational
-import android.view.SurfaceView
-import android.view.TextureView
-import android.view.View
-import android.view.ViewGroup
 import androidx.activity.ComponentActivity
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
@@ -25,10 +18,6 @@ import com.theoplayer.android.api.error.ErrorCode
 import com.theoplayer.android.api.error.THEOplayerException
 import com.theoplayer.android.api.player.PresentationMode
 
-private val PIP_ASPECT_RATIO_DEFAULT = Rational(16, 9)
-private val PIP_ASPECT_RATIO_MIN = Rational(100, 239)
-private val PIP_ASPECT_RATIO_MAX = Rational(239, 100)
-
 class PresentationManager(
   private val viewCtx: ReactTHEOplayerContext,
   private val reactContext: ThemedReactContext,
@@ -38,6 +27,8 @@ class PresentationManager(
   private var onUserLeaveHintReceiver: BroadcastReceiver? = null
   private var onPictureInPictureModeChanged: BroadcastReceiver? = null
 
+  private val pipUtils: PipUtils = PipUtils(viewCtx, reactContext)
+
   var currentPresentationMode: PresentationMode = PresentationMode.INLINE
     private set
 
@@ -57,15 +48,9 @@ class PresentationManager(
         // Dispatch event on every PiP mode change
         val inPip = intent?.getBooleanExtra("isInPictureInPictureMode", false) ?: false
         if (inPip) {
-          updatePresentationMode(PresentationMode.PICTURE_IN_PICTURE)
+          onEnterPip()
         } else {
-          val pipCtx: PresentationModeChangePipContext = if ((reactContext.currentActivity as? ComponentActivity)
-            ?.lifecycle?.currentState == Lifecycle.State.CREATED) {
-            PresentationModeChangePipContext.CLOSED
-          } else {
-            PresentationModeChangePipContext.RESTORED
-          }
-          updatePresentationMode(PresentationMode.INLINE, PresentationModeChangeContext(pipCtx))
+          onExitPip()
         }
       }
     }
@@ -85,6 +70,7 @@ class PresentationManager(
     try {
       reactContext.currentActivity?.unregisterReceiver(onUserLeaveHintReceiver)
       reactContext.currentActivity?.unregisterReceiver(onPictureInPictureModeChanged)
+      pipUtils.destroy()
     } catch (ignore: Exception) {
     }
   }
@@ -104,20 +90,6 @@ class PresentationManager(
     }
   }
 
-  private fun getContentViewRect(view: ViewGroup): Rect? {
-    for (i in 0 until view.childCount) {
-      val child: View = view.getChildAt(i)
-      if (child is ViewGroup) {
-        return getContentViewRect(child)
-      } else if (child as? SurfaceView != null || child as? TextureView != null) {
-        val visibleRect = Rect()
-        child.getGlobalVisibleRect(visibleRect)
-        return visibleRect
-      }
-    }
-    return null
-  }
-
   private fun enterPip() {
     // PiP not supported
     if (!supportsPip || Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
@@ -141,33 +113,28 @@ class PresentationManager(
     }
 
     try {
-      val view = viewCtx.playerView
-      val visibleRect = getContentViewRect(view)
-      reactContext.currentActivity?.enterPictureInPictureMode(
-        PictureInPictureParams.Builder().setSourceRectHint(visibleRect)
-          // Must be between 2.39:1 and 1:2.39 (inclusive)
-          .setAspectRatio(getSafeAspectRatio(view.player.videoWidth, view.player.videoHeight))
-          // The active MediaSession will connect the controls
-          .build()
-      )
+      pipUtils.enable()
+      reactContext.currentActivity?.enterPictureInPictureMode(pipUtils.getPipParams())
     } catch (_: Exception) {
       onPipError()
     }
   }
 
-  private fun getSafeAspectRatio(width: Int, height: Int): Rational {
-    val aspectRatio = Rational(width, height)
-    if (aspectRatio.isNaN || aspectRatio.isInfinite || aspectRatio.isZero) {
-      // Default aspect ratio
-      return PIP_ASPECT_RATIO_DEFAULT
-    }
-    if (aspectRatio > PIP_ASPECT_RATIO_MAX) {
-      return PIP_ASPECT_RATIO_MAX
-    }
-    if (aspectRatio < PIP_ASPECT_RATIO_MIN) {
-      return PIP_ASPECT_RATIO_MIN
-    }
-    return aspectRatio
+  private fun onEnterPip() {
+    updatePresentationMode(PresentationMode.PICTURE_IN_PICTURE)
+  }
+
+  private fun onExitPip() {
+    val pipCtx: PresentationModeChangePipContext =
+      if ((reactContext.currentActivity as? ComponentActivity)
+          ?.lifecycle?.currentState == Lifecycle.State.CREATED
+      ) {
+        PresentationModeChangePipContext.CLOSED
+      } else {
+        PresentationModeChangePipContext.RESTORED
+      }
+    updatePresentationMode(PresentationMode.INLINE, PresentationModeChangeContext(pipCtx))
+    pipUtils.disable()
   }
 
   private fun hasPipPermission(): Boolean {

package/android/src/main/res/drawable/ic_fast_forward.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
+</vector>

package/android/src/main/res/drawable/ic_rewind.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
+</vector>

package/android/src/main/res/values/strings.xml

@@ -2,6 +2,14 @@
 <resources>
   <string name="pause">Pause</string>
   <string name="play">Play</string>
+  <string name="pause_pip">Pause</string>
+  <string name="pause_desc_pip">Pause video</string>
+  <string name="play_pip">Play</string>
+  <string name="play_desc_pip">Play video</string>
+  <string name="ffd_pip">Fast Forward</string>
+  <string name="ffd_desc_pip">Fast Forward video</string>
+  <string name="rwd_pip">Rewind</string>
+  <string name="rwd_desc_pip">Rewind video</string>
 
   <string name="background_playback_service_description">THEOplayer service providing background playback.</string>
   <string name="notification_channel_id">theoplayer_default_channel</string>

package/ios/THEOplayerRCTMainEventHandler.swift

@@ -239,7 +239,7 @@ class THEOplayerRCTMainEventHandler {
             if let forwardedErrorEvent = self?.onNativeError,
                let errorObject = event.errorObject
             {
-                let errorCodeString = String(describing: errorObject.code)
+                let errorCodeString = String(errorObject.code.rawValue)
                 let errorCodeMessage = errorObject.message
                 forwardedErrorEvent(
                     [

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -124,9 +124,9 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
     @objc(setPipConfig:pipConfig:)
     func setPipConfig(_ node: NSNumber, pipConfig: NSDictionary) -> Void {
         DispatchQueue.main.async {
-            let newPipConfig: PipConfig = self.parsePipConfig(configDict: pipConfig)
             if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView {
-                theView.pipConfig = newPipConfig
+                let pipConfig = self.parsePipConfig(configDict: pipConfig)
+                theView.pipConfig = pipConfig
             }
         }
         return
@@ -134,7 +134,6 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
     
     private func parsePipConfig(configDict: NSDictionary) -> PipConfig {
         var pipConfig = PipConfig()
-        pipConfig.retainPresentationModeOnSourceChange = configDict["retainPresentationModeOnSourceChange"] as? Bool ?? false
         pipConfig.canStartPictureInPictureAutomaticallyFromInline = configDict["startsAutomatically"] as? Bool ?? false
         return pipConfig
     }

package/ios/THEOplayerRCTView.swift

@@ -15,10 +15,15 @@ public class THEOplayerRCTView: UIView {
     var nowPlayingManager: THEOplayerRCTNowPlayingManager
     var remoteCommandsManager: THEOplayerRCTRemoteCommandsManager
     var pipControlsManager: THEOplayerRCTPipControlsManager
+    var presentationModeContext = THEOplayerRCTPresentationModeContext()
     var adsConfig = AdsConfig()
     var castConfig = CastConfig()
-    var pipConfig = PipConfig()
-    var presentationModeContext = THEOplayerRCTPresentationModeContext()
+    
+    var pipConfig = PipConfig() {
+        didSet {
+            self.pipControlsManager.setPipConfig(pipConfig)
+        }
+    }
     var backgroundAudioConfig = BackgroundAudioConfig() {
         didSet {
             self.remoteCommandsManager.setBackGroundAudioConfig(backgroundAudioConfig)

package/ios/pip/THEOplayerRCTPipControlsManager.swift

@@ -8,18 +8,9 @@ import MediaPlayer
 class THEOplayerRCTPipControlsManager: NSObject {
     // MARK: Members
     private weak var player: THEOplayer?
-    private var _nativePictureInPictureController: Any?
     private var isLive: Bool = false
     private var inAd: Bool = false
-    
-    @available(tvOS 14.0, *)
-    private weak var nativePictureInPictureController: AVPictureInPictureController? {
-        get {
-            return _nativePictureInPictureController as? AVPictureInPictureController
-        } set {
-            _nativePictureInPictureController = newValue
-        }
-    }
+    private var pipConfig = PipConfig()
     
     // MARK: player Listeners
     private var durationChangeListener: EventListener?
@@ -43,11 +34,13 @@ class THEOplayerRCTPipControlsManager: NSObject {
         self.attachListeners()
     }
     
-    @available(tvOS 14.0, *)
-    func setNativePictureInPictureController(_ nativePictureInPictureController: AVPictureInPictureController?) {
-        self.nativePictureInPictureController = nativePictureInPictureController;
-        if self.nativePictureInPictureController != nil,
-           let player = self.player,
+    func setPipConfig(_ newPipConfig: PipConfig) {
+        self.pipConfig = newPipConfig
+        self.updatePipControls()
+    }
+    
+    func willStartPip() {
+        if let player = self.player,
            let duration = player.duration {
             self.isLive = duration.isInfinite
 #if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
@@ -60,16 +53,32 @@ class THEOplayerRCTPipControlsManager: NSObject {
 #endif
         }
     }
-
-    @available(tvOS 14.0, *)
+    
     private func updatePipControls() {
-        if let controller = self.nativePictureInPictureController {
-            if #available(iOS 14.0, *) {
-                controller.requiresLinearPlayback = self.isLive || self.inAd
-                if DEBUG_PIPCONTROLS { print("[NATIVE] Pip controls updated for \(self.isLive ? "LIVE" : "VOD") (\(self.inAd ? "AD IS PLAYING" : "NO AD PLAYING")).") }
-            }
+        if let player = self.player,
+           let pip = player.pip {
+            pip.configure(configuration: self.newPipConfiguration())
+            if DEBUG_PIPCONTROLS { print("[NATIVE] Pip controls updated for \(self.isLive ? "LIVE" : "VOD") (\(self.inAd ? "AD IS PLAYING" : "NO AD PLAYING")). (requiresLinearPlayback = \(self.isLive || self.inAd), canStartPictureInPictureAutomaticallyFromInline = \(self.pipConfig.canStartPictureInPictureAutomaticallyFromInline))") }
         }
     }
+        
+#if os(iOS)
+    
+    func newPipConfiguration() -> PiPConfiguration {
+        return PiPConfiguration(retainPresentationModeOnSourceChange: false,
+                                nativePictureInPicture: true,
+                                canStartPictureInPictureAutomaticallyFromInline: self.pipConfig.canStartPictureInPictureAutomaticallyFromInline,
+                                requiresLinearPlayback: self.isLive || self.inAd)
+    }
+    
+#elseif os(tvOS)
+    
+    func newPipConfiguration() -> PiPConfiguration {
+        return PiPConfiguration(retainPresentationModeOnSourceChange: false,
+                                requiresLinearPlayback: self.isLive || self.inAd)
+    }
+    
+#endif
     
     private func attachListeners() {
         guard let player = self.player else {
@@ -80,9 +89,7 @@ class THEOplayerRCTPipControlsManager: NSObject {
         self.durationChangeListener = player.addEventListener(type: PlayerEventTypes.DURATION_CHANGE) { [weak self] event in
             if let duration = event.duration {
                 self?.isLive = duration.isInfinite
-                if #available(iOS 14.0, tvOS 14.0, *) {
-                    self?.updatePipControls()
-                }
+                self?.updatePipControls()
             }
         }
         
@@ -90,9 +97,7 @@ class THEOplayerRCTPipControlsManager: NSObject {
         self.sourceChangeListener = player.addEventListener(type: PlayerEventTypes.SOURCE_CHANGE) { [weak self] event in
             self?.isLive = false
             self?.inAd = false
-            if #available(iOS 14.0, tvOS 14.0, *) {
-                self?.updatePipControls()
-            }
+            self?.updatePipControls()
         }
         
 #if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)

package/ios/pip/THEOplayerRCTView+PipConfig.swift

@@ -5,25 +5,25 @@ import AVKit
 import THEOplayerSDK
 
 struct PipConfig {
-    var retainPresentationModeOnSourceChange: Bool = false              // external config
-    var canStartPictureInPictureAutomaticallyFromInline: Bool = false   // external config
+    var canStartPictureInPictureAutomaticallyFromInline: Bool = false
 }
 
-
 extension THEOplayerRCTView: AVPictureInPictureControllerDelegate {
     
 #if os(iOS)
     
-    func playerPipConfiguration() -> PiPConfiguration? {
-        return PiPConfiguration(retainPresentationModeOnSourceChange: self.pipConfig.retainPresentationModeOnSourceChange,
+    func playerPipConfiguration() -> PiPConfiguration {
+        return PiPConfiguration(retainPresentationModeOnSourceChange: false,
                                 nativePictureInPicture: true,
-                                canStartPictureInPictureAutomaticallyFromInline: self.pipConfig.canStartPictureInPictureAutomaticallyFromInline)
+                                canStartPictureInPictureAutomaticallyFromInline: self.pipConfig.canStartPictureInPictureAutomaticallyFromInline,
+                                requiresLinearPlayback: false)
     }
     
 #elseif os(tvOS)
     
-    func playerPipConfiguration() -> PiPConfiguration? {
-        return PiPConfiguration(retainPresentationModeOnSourceChange: self.pipConfig.retainPresentationModeOnSourceChange)
+    func playerPipConfiguration() -> PiPConfiguration {
+        return PiPConfiguration(retainPresentationModeOnSourceChange: false,
+                                requiresLinearPlayback: false)
     }
     
 #endif
@@ -41,12 +41,7 @@ extension THEOplayerRCTView: AVPictureInPictureControllerDelegate {
     @available(tvOS 14.0, *)
     public func pictureInPictureControllerWillStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
         self.presentationModeContext.pipContext = .PIP_CLOSED
-        self.pipControlsManager.setNativePictureInPictureController(pictureInPictureController)
-    }
-    
-    @available(tvOS 14.0, *)
-    public func pictureInPictureControllerWillStopPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-        self.pipControlsManager.setNativePictureInPictureController(nil)
+        self.pipControlsManager.willStartPip()
     }
     
     @available(tvOS 14.0, *)

package/lib/commonjs/api/config/PlayerConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["PlayerConfiguration.ts"],"sourcesContent":["import type { AdsConfiguration } from '../ads/AdsConfiguration';\nimport type { CastConfiguration } from '../cast/CastConfiguration';\nimport type { MediaControlConfiguration } from '../media/MediaControlConfiguration';\n\nexport interface PlayerConfiguration {\n  /**\n   * The directory in which the THEOplayer library worker files are located.\n   * These worker files are THEOplayer.transmux.*\n   *\n   * @remarks\n   * <br/> - This parameter is required when using a HLS source and has no default.\n   *\n   * @example\n   * `'/lib/theoplayer/'`\n   */\n  libraryLocation?: string;\n\n  /**\n   * The muted autoplay policy for web.\n   *\n   * @remarks\n   * <br/> - The muted autoplay policy is impacted by this property and {@link SourceConfiguration.mutedAutoplay}.\n   *\n   * @defaultValue `'none'`.\n   */\n  mutedAutoplay?: MutedAutoplayConfiguration;\n\n  /**\n   * The ads configuration for the player.\n   */\n  ads?: AdsConfiguration;\n\n  /**\n   * The cast configuration for the player.\n   */\n  cast?: CastConfiguration;\n\n  /**\n   * The configuration of media controls and media sessions across platforms.\n   */\n  mediaControl?: MediaControlConfiguration;\n\n  /**\n   * The license for the player\n   */\n  readonly license?: string;\n\n  /**\n   * The url to fetch the license for the player\n   */\n  readonly licenseUrl?: string;\n\n  /**\n   * Sets whether the native player is chromeless (without UI).\n   */\n  readonly chromeless?: boolean;\n}\n\n/**\n * The muted autoplay policy of a player for web.\n * <br/> - `'none'`: Disallow muted autoplay. If the player is requested to autoplay while unmuted, and the platform does not support unmuted autoplay, the player will not start playback.\n * <br/> - `'all'`: Allow muted autoplay. If the player is requested to autoplay while unmuted, and the platform supports muted autoplay, the player will start muted playback.\n * <br/> - `'content'`: Allow muted autoplay only for the main content. Disallow muted autoplay for e.g. advertisements. (Not yet supported.)\n *\n * @public\n */\nexport type MutedAutoplayConfiguration = 'none' | 'all' | 'content';\n"],"mappings":""}
+{"version":3,"names":[],"sources":["PlayerConfiguration.ts"],"sourcesContent":["import type { AdsConfiguration } from '../ads/AdsConfiguration';\nimport type { CastConfiguration } from '../cast/CastConfiguration';\nimport type { MediaControlConfiguration } from '../media/MediaControlConfiguration';\nimport type { RetryConfiguration } from '../utils/RetryConfiguration';\n\nexport interface PlayerConfiguration {\n  /**\n   * The directory in which the THEOplayer library worker files are located.\n   * These worker files are THEOplayer.transmux.*\n   *\n   * @remarks\n   * <br/> - This parameter is required when using a HLS source and has no default.\n   *\n   * @example\n   * `'/lib/theoplayer/'`\n   */\n  libraryLocation?: string;\n\n  /**\n   * The muted autoplay policy for web.\n   *\n   * @remarks\n   * <br/> - The muted autoplay policy is impacted by this property and {@link SourceConfiguration.mutedAutoplay}.\n   *\n   * @defaultValue `'none'`.\n   */\n  mutedAutoplay?: MutedAutoplayConfiguration;\n\n  /**\n   * The ads configuration for the player.\n   */\n  ads?: AdsConfiguration;\n\n  /**\n   * The cast configuration for the player.\n   */\n  cast?: CastConfiguration;\n\n  /**\n   * The configuration of media controls and media sessions across platforms.\n   */\n  mediaControl?: MediaControlConfiguration;\n\n  /**\n   * The license for the player\n   */\n  readonly license?: string;\n\n  /**\n   * The url to fetch the license for the player\n   */\n  readonly licenseUrl?: string;\n\n  /**\n   * Sets whether the native player is chromeless (without UI).\n   */\n  readonly chromeless?: boolean;\n\n  /**\n   * The retry configuration for the player.\n   *\n   * @remarks\n   * <br/> - This parameter only applies to Web and Android platforms.\n   */\n  readonly retryConfiguration?: RetryConfiguration;\n}\n\n/**\n * The muted autoplay policy of a player for web.\n * <br/> - `'none'`: Disallow muted autoplay. If the player is requested to autoplay while unmuted, and the platform does not support unmuted autoplay, the player will not start playback.\n * <br/> - `'all'`: Allow muted autoplay. If the player is requested to autoplay while unmuted, and the platform supports muted autoplay, the player will start muted playback.\n * <br/> - `'content'`: Allow muted autoplay only for the main content. Disallow muted autoplay for e.g. advertisements. (Not yet supported.)\n *\n * @public\n */\nexport type MutedAutoplayConfiguration = 'none' | 'all' | 'content';\n"],"mappings":""}

package/lib/commonjs/api/utils/RetryConfiguration.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=RetryConfiguration.js.map

package/lib/commonjs/api/utils/RetryConfiguration.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["RetryConfiguration.ts"],"sourcesContent":["/**\n * Object containing values used for the player's retry mechanisms.\n */\nexport interface RetryConfiguration {\n  /**\n   * The maximum amount of retries before the player throws a fatal error.\n   * Defaults to `Infinity`.\n   */\n  readonly maxRetries?: number;\n\n  /**\n   * The initial delay in milliseconds before a retry request occurs.\n   * Exponential backoff will be applied on this value.\n   * Defaults to `200`.\n   */\n  readonly minimumBackoff?: number;\n\n  /**\n   * The maximum amount of delay in milliseconds between retry requests.\n   * Defaults to `30000`.\n   */\n  readonly maximumBackoff?: number;\n}\n"],"mappings":""}

package/lib/module/api/config/PlayerConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["PlayerConfiguration.ts"],"sourcesContent":["import type { AdsConfiguration } from '../ads/AdsConfiguration';\nimport type { CastConfiguration } from '../cast/CastConfiguration';\nimport type { MediaControlConfiguration } from '../media/MediaControlConfiguration';\n\nexport interface PlayerConfiguration {\n  /**\n   * The directory in which the THEOplayer library worker files are located.\n   * These worker files are THEOplayer.transmux.*\n   *\n   * @remarks\n   * <br/> - This parameter is required when using a HLS source and has no default.\n   *\n   * @example\n   * `'/lib/theoplayer/'`\n   */\n  libraryLocation?: string;\n\n  /**\n   * The muted autoplay policy for web.\n   *\n   * @remarks\n   * <br/> - The muted autoplay policy is impacted by this property and {@link SourceConfiguration.mutedAutoplay}.\n   *\n   * @defaultValue `'none'`.\n   */\n  mutedAutoplay?: MutedAutoplayConfiguration;\n\n  /**\n   * The ads configuration for the player.\n   */\n  ads?: AdsConfiguration;\n\n  /**\n   * The cast configuration for the player.\n   */\n  cast?: CastConfiguration;\n\n  /**\n   * The configuration of media controls and media sessions across platforms.\n   */\n  mediaControl?: MediaControlConfiguration;\n\n  /**\n   * The license for the player\n   */\n  readonly license?: string;\n\n  /**\n   * The url to fetch the license for the player\n   */\n  readonly licenseUrl?: string;\n\n  /**\n   * Sets whether the native player is chromeless (without UI).\n   */\n  readonly chromeless?: boolean;\n}\n\n/**\n * The muted autoplay policy of a player for web.\n * <br/> - `'none'`: Disallow muted autoplay. If the player is requested to autoplay while unmuted, and the platform does not support unmuted autoplay, the player will not start playback.\n * <br/> - `'all'`: Allow muted autoplay. If the player is requested to autoplay while unmuted, and the platform supports muted autoplay, the player will start muted playback.\n * <br/> - `'content'`: Allow muted autoplay only for the main content. Disallow muted autoplay for e.g. advertisements. (Not yet supported.)\n *\n * @public\n */\nexport type MutedAutoplayConfiguration = 'none' | 'all' | 'content';\n"],"mappings":""}
+{"version":3,"names":[],"sources":["PlayerConfiguration.ts"],"sourcesContent":["import type { AdsConfiguration } from '../ads/AdsConfiguration';\nimport type { CastConfiguration } from '../cast/CastConfiguration';\nimport type { MediaControlConfiguration } from '../media/MediaControlConfiguration';\nimport type { RetryConfiguration } from '../utils/RetryConfiguration';\n\nexport interface PlayerConfiguration {\n  /**\n   * The directory in which the THEOplayer library worker files are located.\n   * These worker files are THEOplayer.transmux.*\n   *\n   * @remarks\n   * <br/> - This parameter is required when using a HLS source and has no default.\n   *\n   * @example\n   * `'/lib/theoplayer/'`\n   */\n  libraryLocation?: string;\n\n  /**\n   * The muted autoplay policy for web.\n   *\n   * @remarks\n   * <br/> - The muted autoplay policy is impacted by this property and {@link SourceConfiguration.mutedAutoplay}.\n   *\n   * @defaultValue `'none'`.\n   */\n  mutedAutoplay?: MutedAutoplayConfiguration;\n\n  /**\n   * The ads configuration for the player.\n   */\n  ads?: AdsConfiguration;\n\n  /**\n   * The cast configuration for the player.\n   */\n  cast?: CastConfiguration;\n\n  /**\n   * The configuration of media controls and media sessions across platforms.\n   */\n  mediaControl?: MediaControlConfiguration;\n\n  /**\n   * The license for the player\n   */\n  readonly license?: string;\n\n  /**\n   * The url to fetch the license for the player\n   */\n  readonly licenseUrl?: string;\n\n  /**\n   * Sets whether the native player is chromeless (without UI).\n   */\n  readonly chromeless?: boolean;\n\n  /**\n   * The retry configuration for the player.\n   *\n   * @remarks\n   * <br/> - This parameter only applies to Web and Android platforms.\n   */\n  readonly retryConfiguration?: RetryConfiguration;\n}\n\n/**\n * The muted autoplay policy of a player for web.\n * <br/> - `'none'`: Disallow muted autoplay. If the player is requested to autoplay while unmuted, and the platform does not support unmuted autoplay, the player will not start playback.\n * <br/> - `'all'`: Allow muted autoplay. If the player is requested to autoplay while unmuted, and the platform supports muted autoplay, the player will start muted playback.\n * <br/> - `'content'`: Allow muted autoplay only for the main content. Disallow muted autoplay for e.g. advertisements. (Not yet supported.)\n *\n * @public\n */\nexport type MutedAutoplayConfiguration = 'none' | 'all' | 'content';\n"],"mappings":""}

package/lib/module/api/utils/RetryConfiguration.js

@@ -0,0 +1,2 @@
+
+//# sourceMappingURL=RetryConfiguration.js.map

package/lib/module/api/utils/RetryConfiguration.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["RetryConfiguration.ts"],"sourcesContent":["/**\n * Object containing values used for the player's retry mechanisms.\n */\nexport interface RetryConfiguration {\n  /**\n   * The maximum amount of retries before the player throws a fatal error.\n   * Defaults to `Infinity`.\n   */\n  readonly maxRetries?: number;\n\n  /**\n   * The initial delay in milliseconds before a retry request occurs.\n   * Exponential backoff will be applied on this value.\n   * Defaults to `200`.\n   */\n  readonly minimumBackoff?: number;\n\n  /**\n   * The maximum amount of delay in milliseconds between retry requests.\n   * Defaults to `30000`.\n   */\n  readonly maximumBackoff?: number;\n}\n"],"mappings":""}

package/lib/typescript/api/config/PlayerConfiguration.d.ts

@@ -1,6 +1,7 @@
 import type { AdsConfiguration } from '../ads/AdsConfiguration';
 import type { CastConfiguration } from '../cast/CastConfiguration';
 import type { MediaControlConfiguration } from '../media/MediaControlConfiguration';
+import type { RetryConfiguration } from '../utils/RetryConfiguration';
 export interface PlayerConfiguration {
     /**
      * The directory in which the THEOplayer library worker files are located.
@@ -46,6 +47,13 @@ export interface PlayerConfiguration {
      * Sets whether the native player is chromeless (without UI).
      */
     readonly chromeless?: boolean;
+    /**
+     * The retry configuration for the player.
+     *
+     * @remarks
+     * <br/> - This parameter only applies to Web and Android platforms.
+     */
+    readonly retryConfiguration?: RetryConfiguration;
 }
 /**
  * The muted autoplay policy of a player for web.

package/lib/typescript/api/utils/RetryConfiguration.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Object containing values used for the player's retry mechanisms.
+ */
+export interface RetryConfiguration {
+    /**
+     * The maximum amount of retries before the player throws a fatal error.
+     * Defaults to `Infinity`.
+     */
+    readonly maxRetries?: number;
+    /**
+     * The initial delay in milliseconds before a retry request occurs.
+     * Exponential backoff will be applied on this value.
+     * Defaults to `200`.
+     */
+    readonly minimumBackoff?: number;
+    /**
+     * The maximum amount of delay in milliseconds between retry requests.
+     * Defaults to `30000`.
+     */
+    readonly maximumBackoff?: number;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -116,7 +116,7 @@
     "react-native-svg": "^13.8.0",
     "react-native-svg-web": "^1.0.0",
     "react-native-url-polyfill": "^1.3.0",
-    "theoplayer": "^4.6.0",
+    "theoplayer": ">=5.0.1",
     "url-polyfill": "^1.1.12"
   }
 }

package/react-native-theoplayer.podspec

@@ -2,7 +2,7 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 theoconfigpath = File.join(__dir__ + "/../../", "react-native-theoplayer.json")
-if File.exists?(theoconfigpath) 
+if File.exist?(theoconfigpath) 
   theoconfig = JSON.parse(File.read(theoconfigpath))
   theofeatures = theoconfig["ios"]["features"]
 else
@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
     }
   else 
   	puts "Using THEOplayer-core SDK"
-    s.dependency "THEOplayerSDK-core"
+    s.dependency "THEOplayerSDK-core", "~> 5.0.1"
     if theofeatures.include?("GOOGLE_IMA") 
 	  puts "Adding THEOplayer-Integration-GoogleIMA"
       s.dependency "THEOplayer-Integration-GoogleIMA"
@@ -44,7 +44,6 @@ Pod::Spec.new do |s|
     if theofeatures.include?("CHROMECAST")
 	  puts "Adding THEOplayer-Integration-GoogleCast"
       s.ios.dependency "THEOplayer-Integration-GoogleCast"
-      s.ios.dependency "google-cast-sdk-dynamic-xcframework-no-bluetooth"
     end
   end
   

package/src/api/config/PlayerConfiguration.ts

@@ -1,6 +1,7 @@
 import type { AdsConfiguration } from '../ads/AdsConfiguration';
 import type { CastConfiguration } from '../cast/CastConfiguration';
 import type { MediaControlConfiguration } from '../media/MediaControlConfiguration';
+import type { RetryConfiguration } from '../utils/RetryConfiguration';
 
 export interface PlayerConfiguration {
   /**
@@ -54,6 +55,14 @@ export interface PlayerConfiguration {
    * Sets whether the native player is chromeless (without UI).
    */
   readonly chromeless?: boolean;
+
+  /**
+   * The retry configuration for the player.
+   *
+   * @remarks
+   * <br/> - This parameter only applies to Web and Android platforms.
+   */
+  readonly retryConfiguration?: RetryConfiguration;
 }
 
 /**

package/src/api/utils/RetryConfiguration.ts

@@ -0,0 +1,23 @@
+/**
+ * Object containing values used for the player's retry mechanisms.
+ */
+export interface RetryConfiguration {
+  /**
+   * The maximum amount of retries before the player throws a fatal error.
+   * Defaults to `Infinity`.
+   */
+  readonly maxRetries?: number;
+
+  /**
+   * The initial delay in milliseconds before a retry request occurs.
+   * Exponential backoff will be applied on this value.
+   * Defaults to `200`.
+   */
+  readonly minimumBackoff?: number;
+
+  /**
+   * The maximum amount of delay in milliseconds between retry requests.
+   * Defaults to `30000`.
+   */
+  readonly maximumBackoff?: number;
+}