react-native-theoplayer 2.0.0 → 2.2.0

package/CHANGELOG.md

@@ -5,6 +5,32 @@ 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).
 
+## [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
+
+- Fixed invalid location of the typescript declaration file.
+- Fixed an issue on Android where the player would not pause when closing the app while background playback is disabled.
+
+### Changed
+
+- Removed `backgroundAudioConfiguration.mediaPlaybackServiceEnabled` property on Android. Disabling background playback disables the service as well.
+
 ## [2.0.0] - 23-04-06
 
 ### Added

package/android/build.gradle

@@ -105,9 +105,11 @@ 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.11.0-local"
+  def theoplayer_mediasession_version = "4.12.0-local"
   def enabledV4 = theoplayer_sdk_version.toString().startsWith("4.")
   def core_prefix = enabledV4 ? 'unified' : 'core'
   def integration_prefix = enabledV4 ? 'unified' : 'integration'

package/android/local/com/theoplayer/android-connector/mediasession/{4.11.0-local/mediasession-4.11.0-local.pom → 4.12.0-local/mediasession-4.12.0-local.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.theoplayer.android-connector</groupId>
   <artifactId>mediasession</artifactId>
-  <version>4.11.0-local</version>
+  <version>4.12.0-local</version>
   <packaging>aar</packaging>
   <dependencies>
     <dependency>

package/android/local/com/theoplayer/android-connector/mediasession/maven-metadata-local.xml

@@ -3,11 +3,11 @@
   <groupId>com.theoplayer.android-connector</groupId>
   <artifactId>mediasession</artifactId>
   <versioning>
-    <latest>4.11.0-local</latest>
-    <release>4.11.0-local</release>
+    <latest>4.12.0-local</latest>
+    <release>4.12.0-local</release>
     <versions>
-      <version>4.11.0-local</version>
+      <version>4.12.0-local</version>
     </versions>
-    <lastUpdated>20230403121710</lastUpdated>
+    <lastUpdated>20230408184844</lastUpdated>
   </versioning>
 </metadata>

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/ReactTHEOplayerContext.kt

@@ -39,12 +39,9 @@ class ReactTHEOplayerContext private constructor(
   private var binder: MediaPlaybackService.MediaPlaybackBinder? = null
   private var mediaSessionConnector: MediaSessionConnector? = null
 
-  var backgroundAudioConfig: BackgroundAudioConfig = BackgroundAudioConfig(
-    enabled = false,
-    mediaPlaybackServiceEnabled = true
-  )
+  var backgroundAudioConfig: BackgroundAudioConfig = BackgroundAudioConfig(enabled = false)
     set(value) {
-      applyBackgroundPlaybackConfig(value)
+      applyBackgroundPlaybackConfig(value, field)
       field = value
     }
 
@@ -56,14 +53,18 @@ class ReactTHEOplayerContext private constructor(
   var daiIntegration: GoogleDaiIntegration? = null
   var imaIntegration: GoogleImaIntegration? = null
   var castIntegration: CastIntegration? = null
+  var wasPlayingOnHostPause: Boolean = false
 
   private val isBackgroundAudioEnabled: Boolean
-    get() = backgroundAudioConfig.enabled && backgroundAudioConfig.mediaPlaybackServiceEnabled
+    get() = backgroundAudioConfig.enabled
 
   companion object {
     private var mediaControlledInstance: ReactTHEOplayerContext? = null
 
-    fun create(reactContext: ThemedReactContext, playerConfig: THEOplayerConfig): ReactTHEOplayerContext {
+    fun create(
+      reactContext: ThemedReactContext,
+      playerConfig: THEOplayerConfig
+    ): ReactTHEOplayerContext {
       return ReactTHEOplayerContext(reactContext).apply {
         initializePlayerView(playerConfig)
       }
@@ -74,7 +75,10 @@ class ReactTHEOplayerContext private constructor(
     override fun onServiceConnected(className: ComponentName, service: IBinder) {
       binder = service as MediaPlaybackService.MediaPlaybackBinder
 
-      // Get media session
+      // Clean-up any existing media session connector
+      mediaSessionConnector?.destroy()
+
+      // Get media session connector from service
       mediaSessionConnector = binder?.mediaSessionConnector
       mediaSessionConnector?.player = player
       mediaSessionConnector?.setMediaSessionMetadata(player.source)
@@ -91,17 +95,37 @@ class ReactTHEOplayerContext private constructor(
     }
   }
 
-  private fun applyBackgroundPlaybackConfig(config: BackgroundAudioConfig) {
-    if (BuildConfig.USE_PLAYBACK_SERVICE) {
-      reactContext.applicationContext.packageManager.setComponentEnabledSetting(
-        ComponentName(reactContext.applicationContext, MediaPlaybackService::class.java),
-        if (config.mediaPlaybackServiceEnabled) PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-        else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-        PackageManager.DONT_KILL_APP
-      )
+  private fun setPlaybackServiceEnabled(enabled: Boolean) {
+    reactContext.applicationContext.packageManager.setComponentEnabledSetting(
+      ComponentName(reactContext.applicationContext, MediaPlaybackService::class.java),
+      if (enabled) PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+      else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+      PackageManager.DONT_KILL_APP
+    )
+  }
+
+  private fun applyBackgroundPlaybackConfig(
+    config: BackgroundAudioConfig,
+    prevConfig: BackgroundAudioConfig?
+  ) {
+    if (prevConfig?.enabled == config.enabled) {
+      // No changes
+      return
     }
 
-    binder?.setEnablePlaybackControls(config.enabled)
+    if (BuildConfig.USE_PLAYBACK_SERVICE) {
+      if (prevConfig?.enabled != true && config.enabled) {
+        // Enabling background playback
+        setPlaybackServiceEnabled(true)
+        bindMediaPlaybackService()
+      } else if (prevConfig?.enabled == true) {
+        // Disabling background playback
+        binder?.stopForegroundService()
+        unbindMediaPlaybackService()
+        setPlaybackServiceEnabled(false)
+        initDefaultMediaSession()
+      }
+    }
   }
 
   private fun bindMediaPlaybackService() {
@@ -128,6 +152,7 @@ class ReactTHEOplayerContext private constructor(
         reactContext.unbindService(connection)
       }
     }
+    binder = null
   }
 
   private fun initializePlayerView(playerConfig: THEOplayerConfig) {
@@ -156,13 +181,13 @@ class ReactTHEOplayerContext private constructor(
 
     if (mediaControlledInstance == null) {
       mediaControlledInstance = this
-      if (!BuildConfig.USE_PLAYBACK_SERVICE) {
+      if (!BuildConfig.USE_PLAYBACK_SERVICE || !isBackgroundAudioEnabled) {
         initDefaultMediaSession()
       }
     }
 
     // Apply initial backgroundPlayback config
-    applyBackgroundPlaybackConfig(backgroundAudioConfig)
+    applyBackgroundPlaybackConfig(backgroundAudioConfig, null)
   }
 
   private fun initDefaultMediaSession() {
@@ -225,7 +250,7 @@ class ReactTHEOplayerContext private constructor(
   }
 
   private val onPlay = EventListener<PlayEvent> {
-    if (BuildConfig.USE_PLAYBACK_SERVICE) {
+    if (BuildConfig.USE_PLAYBACK_SERVICE && isBackgroundAudioEnabled) {
       bindMediaPlaybackService()
     }
     binder?.updateNotification(PlaybackStateCompat.STATE_PLAYING)
@@ -266,8 +291,10 @@ class ReactTHEOplayerContext private constructor(
    * The host activity is paused.
    */
   fun onHostPause() {
+    // Keep current playing state when going to background
+    wasPlayingOnHostPause = !player.isPaused
+
     if (!isBackgroundAudioEnabled) {
-      mediaSessionConnector?.setActive(false)
       playerView.onPause()
     }
   }

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

@@ -85,9 +85,7 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
     if (BuildConfig.LOG_VIEW_EVENTS) {
       Log.d(TAG, "onHostPause")
     }
-    if (presentationManager?.shouldPauseOnHostPause != false) {
-      playerContext?.onHostPause()
-    }
+    playerContext?.onHostPause()
   }
 
   /**

package/android/src/main/java/com/theoplayer/audio/BackgroundAudioConfig.kt

@@ -7,11 +7,4 @@ data class BackgroundAudioConfig(
    * @defaultValue `false`
    */
   val enabled: Boolean,
-
-  /**
-   * Set whether the mediaPlaybackService is enabled.
-   *
-   * @defaultValue `true`
-   */
-  val mediaPlaybackServiceEnabled: Boolean
 )

package/android/src/main/java/com/theoplayer/audio/BackgroundAudioConfigAdapter.kt

@@ -4,16 +4,12 @@ import com.facebook.react.bridge.ReadableMap
 
 object BackgroundAudioConfigAdapter {
   private const val PROP_ENABLED = "enabled"
-  private const val PROP_SERVICE_ENABLED = "mediaPlaybackServiceEnabled"
 
   private const val DEFAULT_ENABLED = false
-  private const val DEFAULT_SERVICE_ENABLED = true
 
   fun fromProps(props: ReadableMap?): BackgroundAudioConfig {
     val enabled =
       if (props?.hasKey(PROP_ENABLED) == true) props.getBoolean(PROP_ENABLED) else DEFAULT_ENABLED
-    val serviceEnabled =
-      if (props?.hasKey(PROP_SERVICE_ENABLED) == true) props.getBoolean(PROP_SERVICE_ENABLED) else DEFAULT_SERVICE_ENABLED
-    return BackgroundAudioConfig(enabled, serviceEnabled)
+    return BackgroundAudioConfig(enabled)
   }
 }

package/android/src/main/java/com/theoplayer/audio/MediaNotificationBuilder.kt

@@ -141,9 +141,7 @@ class MediaNotificationBuilder(
 
       // Associate the notification with your session. This allows third-party apps and
       // companion devices to access and control the session.
-      if (enableMediaControls) {
-        style.setMediaSession(mediaSession.sessionToken)
-      }
+      style.setMediaSession(mediaSession.sessionToken)
 
       // Add up to 3 actions to be shown in the notification's standard-sized contentView.
       style.setShowActionsInCompactView(0)

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

@@ -81,18 +81,6 @@ class PresentationManager(
     )
   }
 
-  /**
-   * Whether playback should be allowed to continue when the activity is paused.
-   *
-   * Pause if:
-   * - No PiP available: Build.VERSION.SDK_INT < Build.VERSION_CODES.N (API 24), or;
-   * - Not in PiP mode, and;
-   * - Not configured to automatically go into PiP when going to the background.
-   */
-  val shouldPauseOnHostPause: Boolean
-    get() = Build.VERSION.SDK_INT < Build.VERSION_CODES.N ||
-      (reactContext.currentActivity?.isInPictureInPictureMode != true && pipConfig.startsAutomatically != true)
-
   fun destroy() {
     try {
       reactContext.currentActivity?.unregisterReceiver(onUserLeaveHintReceiver)
@@ -241,6 +229,11 @@ class PresentationManager(
     currentPresentationMode = presentationMode
     eventEmitter.emitPresentationModeChange(presentationMode, prevPresentationMode, context)
 
+    // Resume playing when going to PiP and player was playing
+    if (presentationMode == PresentationMode.PICTURE_IN_PICTURE && viewCtx.wasPlayingOnHostPause) {
+      viewCtx.player.play()
+    }
+
     // Apply background audio config when closing PiP window
     if (context?.pip == PresentationModeChangePipContext.CLOSED && !viewCtx.backgroundAudioConfig.enabled) {
       viewCtx.player.pause()

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/backgroundAudio/BackgroundAudioConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["BackgroundAudioConfiguration.ts"],"sourcesContent":["/**\n * Describes the configuration of the background audio feature.\n *\n * @public\n */\nexport interface BackgroundAudioConfiguration {\n  /**\n   * Whether background audio should be enabled when transitioning to background.\n   *\n   * @defaultValue `false`\n   */\n  readonly enabled?: boolean;\n\n  /**\n   * Whether Android's mediaPlaybackService is enabled.\n   *\n   * The mediaPlaybackService is a MediaBrowserService that provides notifications and background playback.\n   * It can be dynamically disabled if the host app already registers a MediaBrowserService that conflicts with this one.\n   *\n   * @defaultValue `true`\n   */\n  readonly mediaPlaybackServiceEnabled?: boolean;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["BackgroundAudioConfiguration.ts"],"sourcesContent":["/**\n * Describes the configuration of the background audio feature.\n *\n * @public\n */\nexport interface BackgroundAudioConfiguration {\n  /**\n   * Whether background audio should be enabled when transitioning to background.\n   *\n   * @defaultValue `false`\n   */\n  readonly enabled?: boolean;\n}\n"],"mappings":""}

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/backgroundAudio/BackgroundAudioConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["BackgroundAudioConfiguration.ts"],"sourcesContent":["/**\n * Describes the configuration of the background audio feature.\n *\n * @public\n */\nexport interface BackgroundAudioConfiguration {\n  /**\n   * Whether background audio should be enabled when transitioning to background.\n   *\n   * @defaultValue `false`\n   */\n  readonly enabled?: boolean;\n\n  /**\n   * Whether Android's mediaPlaybackService is enabled.\n   *\n   * The mediaPlaybackService is a MediaBrowserService that provides notifications and background playback.\n   * It can be dynamically disabled if the host app already registers a MediaBrowserService that conflicts with this one.\n   *\n   * @defaultValue `true`\n   */\n  readonly mediaPlaybackServiceEnabled?: boolean;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["BackgroundAudioConfiguration.ts"],"sourcesContent":["/**\n * Describes the configuration of the background audio feature.\n *\n * @public\n */\nexport interface BackgroundAudioConfiguration {\n  /**\n   * Whether background audio should be enabled when transitioning to background.\n   *\n   * @defaultValue `false`\n   */\n  readonly enabled?: boolean;\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/backgroundAudio/BackgroundAudioConfiguration.d.ts

@@ -10,13 +10,4 @@ export interface BackgroundAudioConfiguration {
      * @defaultValue `false`
      */
     readonly enabled?: boolean;
-    /**
-     * Whether Android's mediaPlaybackService is enabled.
-     *
-     * The mediaPlaybackService is a MediaBrowserService that provides notifications and background playback.
-     * It can be dynamically disabled if the host app already registers a MediaBrowserService that conflicts with this one.
-     *
-     * @defaultValue `true`
-     */
-    readonly mediaPlaybackServiceEnabled?: boolean;
 }

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,10 +1,10 @@
 {
   "name": "react-native-theoplayer",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
-  "types": "lib/typescript/src/index.d.ts",
+  "types": "lib/typescript/index.d.ts",
   "react-native": "src/index",
   "source": "src/index",
   "files": [
@@ -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,11 +2,11 @@ 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
-  theofeatures = []
+  theofeatures = ["NONE"]
 end
 
 Pod::Spec.new do |s|
@@ -28,17 +28,21 @@ Pod::Spec.new do |s|
   
   # THEOplayer Dependencies
   if theofeatures.include?("WEB") 
+  	puts "Using THEOplayer-basic SDK, marked features: #{theofeatures.join(' ')}"
     s.dependency "THEOplayerSDK-basic"
     s.pod_target_xcconfig = {
       'SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Release]' => theofeatures.join(' '),
       'SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug]' => theofeatures.join(' ')
     }
   else 
-    s.dependency "THEOplayerSDK-core"
+  	puts "Using THEOplayer-core SDK"
+    s.dependency "THEOplayerSDK-core", "~> 5.0.1"
     if theofeatures.include?("GOOGLE_IMA") 
+	  puts "Adding THEOplayer-Integration-GoogleIMA"
       s.dependency "THEOplayer-Integration-GoogleIMA"
     end
     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

package/src/api/backgroundAudio/BackgroundAudioConfiguration.ts

@@ -10,14 +10,4 @@ export interface BackgroundAudioConfiguration {
    * @defaultValue `false`
    */
   readonly enabled?: boolean;
-
-  /**
-   * Whether Android's mediaPlaybackService is enabled.
-   *
-   * The mediaPlaybackService is a MediaBrowserService that provides notifications and background playback.
-   * It can be dynamically disabled if the host app already registers a MediaBrowserService that conflicts with this one.
-   *
-   * @defaultValue `true`
-   */
-  readonly mediaPlaybackServiceEnabled?: boolean;
 }

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;
+}