react-native-theoplayer 9.9.0 → 9.10.0

package/CHANGELOG.md

@@ -5,6 +5,29 @@ 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.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [9.10.0] - 25-08-19
+
+### Fixed
+
+- Fixed an issue on Android where transitioning into picture-in-picture presentation mode with the `THEOplayer_reparent_on_PiP` flag enabled would sometimes break the lay-out.
+- Fixed an issue where the player's `currentTime` would not be immediately updated when dispatching `seeking` and `seeked` events.
+- Fixed an issue on iOS where a listener for `seeked` events was not properly created.
+
+## [9.9.1] - 25-07-31
+
+### Fixed
+
+- Fixed an issue on Web in case the `aspect-ratio` CSS property is not supported on older browsers.
+- Prevented passing infinite or NaN for intializationDelay in TheoAdDescription, on the Android bridge.
+- Fixed and issue on Android where transitioning automatically into PiP presentation mode would fail on Android 16+.
+- Fixed sources without an explicit `type` not being correctly recognized on Android when the URL contains query parameters.
+
+### Added
+
+- Added support for Clearkey DRM on Android.
+- Added `endpoint` property to THEOlive `EndpointLoaded` event.
+- Added support for `ABRStrategyConfiguration` on iOS.
+
 ## [9.9.0] - 25-07-14
 
 ### Added

package/README.md

@@ -145,8 +145,11 @@ functionality. Currently, the following connectors are available:
 | Agama analytics                                           | [![%40theoplayer/react-native-analytics-agama](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-agama?label=%40theoplayer/react-native-analytics-agama)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-agama)                | [`Agama`](https://github.com/THEOplayer/react-native-connectors/tree/main/agama)                 |
 | Comscore analytics                                        | [![%40theoplayer/react-native-analytics-comscore](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-comscore?label=%40theoplayer/react-native-analytics-comscore)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-comscore)    | [`Comscore`](https://github.com/THEOplayer/react-native-connectors/tree/main/comscore)           |
 | Conviva analytics                                         | [![%40theoplayer/react-native-analytics-conviva](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-conviva?label=%40theoplayer/react-native-analytics-conviva)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-conviva)        | [`Conviva`](https://github.com/THEOplayer/react-native-connectors/tree/main/conviva)             |
+| Engage                                                    | [![%40theoplayer/react-native-engage](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-engage?label=%40theoplayer/react-native-engage)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-engage)                                                    | [`Engage`](https://github.com/THEOplayer/react-native-connectors/tree/main/engage)               |
+| Gemius                                                    | [![%40theoplayer/react-native-analytics-gemius](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-gemius?label=%40theoplayer/react-native-analytics-gemius)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-gemius)            | [`Gemius`](https://github.com/THEOplayer/react-native-connectors/tree/main/gemius)               |
 | Mux analytics                                             | [![%40theoplayer/react-native-analytics-mux](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-mux?label=%40theoplayer/react-native-analytics-mux)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-mux)                        | [`Mux`](https://github.com/THEOplayer/react-native-connectors/tree/main/mux)                     |
 | Nielsen analytics                                         | [![%40theoplayer/react-native-analytics-nielsen](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-nielsen?label=%40theoplayer/react-native-analytics-nielsen)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-nielsen)        | [`Nielsen`](https://github.com/THEOplayer/react-native-connectors/tree/main/nielsen)             |
+| Nielsen AdScript analytics                                | [![%40theoplayer/react-native-analytics-adscript](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-adscript?label=%40theoplayer/react-native-analytics-adscript)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-adscript)    | [`AdScript`](https://github.com/THEOplayer/react-native-connectors/tree/main/adscript)           |
 | Youbora analytics                                         | [![%40theoplayer/react-native-analytics-youbora](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-analytics-youbora?label=%40theoplayer/react-native-analytics-youbora)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-analytics-youbora)        | [`Youbora`](https://github.com/THEOplayer/react-native-connectors/tree/main/youbora)             |
 | Yospace SSAI                                              | [![%40theoplayer/react-native-yospace](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-yospace?label=%40theoplayer/react-native-yospace)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-yospace)                                                | [`Yospace`](https://github.com/THEOplayer/react-native-connectors/tree/main/yospace)             |
 | Content protection (DRM)                                  | [![%40theoplayer/react-native-drm](https://img.shields.io/npm/v/%40theoplayer%2Freact-native-drm?label=%40theoplayer/react-native-drm)](https://www.npmjs.com/package/%40theoplayer%2Freact-native-drm)                                                                | [`DRM`](https://github.com/THEOplayer/react-native-theoplayer-drm)                               |

package/android/build.gradle

@@ -43,12 +43,12 @@ def enabledMediaSession = safeExtGet("THEOplayer_extensionMediaSession", 'true')
 def enabledMillicast = safeExtGet("THEOplayer_extensionMillicast", 'false').toBoolean()
 
 android {
-    compileSdk safeExtGet('THEOplayer_compileSdkVersion', 34)
+    compileSdk safeExtGet('THEOplayer_compileSdkVersion', 35)
     namespace "com.theoplayer"
 
     defaultConfig {
         minSdkVersion safeExtGet('THEOplayer_minSdkVersion', 21)
-        targetSdkVersion safeExtGet('THEOplayer_targetSdkVersion', 34)
+        targetSdkVersion safeExtGet('THEOplayer_targetSdkVersion', 35)
         versionCode 1
         versionName "1.0"
 
@@ -124,15 +124,16 @@ repositories {
     mavenLocal()
 }
 
-// The minimum supported THEOplayer version is 9.8.0
-def theoVersion = safeExtGet('THEOplayer_sdk', '[9.8.0, 10.0.0)')
+// The minimum supported THEOplayer version is 9.9.0
+def theoVersion = safeExtGet('THEOplayer_sdk', '[9.9.0, 10.0.0)')
 def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[8.0.0, 10.0.0)')
 def theoAdsWrapperVersion = "9.0.0"
-def coroutinesVersion = safeExtGet('coroutinesVersion', '1.7.3')
+def coroutinesVersion = safeExtGet('coroutinesVersion', '1.10.2')
 def appcompatVersion = safeExtGet('appcompatVersion', '1.7.1')
 def corektxVersion = safeExtGet('corektxVersion', '1.13.1')
-def gsonVersion = "2.12.1"
-def millicastVersion = safeExtGet('millicastVersion', '2.0.0')
+def gsonVersion = safeExtGet('gsonVersion', '2.13.1')
+def activityktxVersion = safeExtGet('activityktxVersion', '1.10.1')
+def millicastVersion = safeExtGet('millicastVersion', '2.4.3')
 
 dependencies {
     def addOptiViewIntegration = { enabled, notation, additional = null ->
@@ -156,6 +157,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
     implementation("androidx.appcompat:appcompat:$appcompatVersion")
     implementation("androidx.core:core-ktx:$corektxVersion")
+    implementation("androidx.activity:activity-ktx:$activityktxVersion")
     implementation("com.google.code.gson:gson:$gsonVersion")
 
     println("Using THEOplayer (${versionString(theoVersion)})")

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

@@ -11,6 +11,7 @@ import com.theoplayer.cast.CastModule
 import com.theoplayer.broadcast.EventBroadcastModule
 import com.theoplayer.playback.PlaybackSettingsModule
 import com.theoplayer.player.PlayerModule
+import com.theoplayer.theolive.THEOliveModule
 
 class ReactTHEOplayerPackage : ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
@@ -21,7 +22,8 @@ class ReactTHEOplayerPackage : ReactPackage {
       CastModule(reactContext),
       CacheModule(reactContext),
       EventBroadcastModule(reactContext),
-      PlaybackSettingsModule(reactContext)
+      PlaybackSettingsModule(reactContext),
+      THEOliveModule(reactContext)
     )
   }
 

package/android/src/main/java/com/theoplayer/drm/ContentProtectionAdapter.kt

@@ -9,6 +9,7 @@ import com.google.gson.Gson
 import com.theoplayer.android.api.contentprotection.KeySystemId
 import com.theoplayer.android.api.contentprotection.Request
 import com.theoplayer.android.api.contentprotection.Response
+import com.theoplayer.android.api.source.drm.ClearkeyKeySystemConfiguration
 import com.theoplayer.android.api.source.drm.DRMConfiguration
 import com.theoplayer.android.api.source.drm.DRMIntegrationId
 import com.theoplayer.android.api.source.drm.KeySystemConfiguration
@@ -27,6 +28,7 @@ const val PROP_KEYSYSTEM_ID: String = "keySystemId"
 const val PROP_DRM_CONFIG: String = "drmConfig"
 const val PROP_PLAYREADY: String = "playready"
 const val PROP_WIDEVINE: String = "widevine"
+const val PROP_CLEARKEY: String = "clearkey"
 const val PROP_REQUEST_ID: String = "requestId"
 const val PROP_URL: String = "url"
 const val PROP_METHOD: String = "method"
@@ -42,6 +44,9 @@ const val PROP_LICENSE_TYPE_TEMPORARY: String = "temporary"
 const val PROP_LICENSE_TYPE_PERSISTENT: String = "persistent"
 const val PROP_QUERY_PARAMETERS: String = "queryParameters"
 const val PROP_CERTIFICATE: String = "certificate"
+const val PROP_KEYS: String = "keys"
+const val PROP_ID: String = "id"
+const val PROP_VALUE: String = "value"
 
 object ContentProtectionAdapter {
 
@@ -93,6 +98,9 @@ object ContentProtectionAdapter {
       if (jsonConfig.has(PROP_PLAYREADY)) {
         playready(keySystemConfigurationFromJson(jsonConfig.getJSONObject(PROP_PLAYREADY)))
       }
+      if (jsonConfig.has(PROP_CLEARKEY)) {
+        clearkey(clearkeyKeySystemConfigurationFromJson(jsonConfig.getJSONObject(PROP_CLEARKEY)))
+      }
       if (jsonConfig.has(PROP_INTEGRATION_PARAMETERS)) {
         integrationParameters(fromJSONObjectToMap(jsonConfig.getJSONObject(PROP_INTEGRATION_PARAMETERS)))
       }
@@ -113,6 +121,30 @@ object ContentProtectionAdapter {
     }.build()
   }
 
+  private fun clearkeyKeySystemConfigurationFromJson(config: JSONObject): ClearkeyKeySystemConfiguration {
+    val jsonKeys = config.optJSONArray(PROP_KEYS)
+    val keys = mutableListOf<ClearkeyKeySystemConfiguration.ClearkeyDecryptionKey>()
+    if (jsonKeys != null) {
+      for (i in 0 until jsonKeys.length()) {
+        val jsonKey = jsonKeys.optJSONObject(i)
+        if (jsonKey != null) {
+          val id = jsonKey.optString(PROP_ID)
+          val value = jsonKey.optString(PROP_VALUE)
+          if (!id.isNullOrEmpty() && !value.isNullOrEmpty()) {
+            keys.add(ClearkeyKeySystemConfiguration.ClearkeyDecryptionKey(id, value))
+          }
+        }
+      }
+    }
+    return ClearkeyKeySystemConfiguration.Builder(config.optString(PROP_LICENSE_ACQUISITION_URL))
+      .apply {
+        useCredentials(config.optBoolean(PROP_USE_CREDENTIALS))
+        headers(fromJSONObjectToMap(config.optJSONObject(PROP_HEADERS)))
+        queryParameters(fromJSONObjectToMap(config.optJSONObject(PROP_QUERY_PARAMETERS)))
+        keys(keys.toTypedArray())
+      }.build()
+  }
+
   private fun licenseTypeFromString(str: String?): LicenseType? {
     return when (str) {
       PROP_LICENSE_TYPE_PERSISTENT -> LicenseType.PERSISTENT

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

@@ -1,15 +1,20 @@
 package com.theoplayer.presentation
 
 import android.util.Log
+import android.view.View
+import android.view.ViewGroup
 import android.view.ViewTreeObserver
+import androidx.core.view.children
 import com.facebook.react.views.view.ReactViewGroup
+import com.theoplayer.ReactTHEOplayerView
 
-private val TAG = "FSLayoutObserver"
+private const val TAG = "FSLayoutObserver"
 
 /**
  * FullScreenLayoutObserver makes sure that the React Native view does not get the layout
- * defined in React-Native during fullscreen presentation mode. We want to enforce fullscreen
+ * defined in ReactNative during fullscreen presentation mode. We want to enforce fullscreen
  * position & size.
+ * Similarly for picture-in-picture presentation mode, enforce a view that stretches the whole screen.
  */
 class FullScreenLayoutObserver {
   private var globalLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
@@ -20,13 +25,22 @@ class FullScreenLayoutObserver {
       Log.w(TAG, "A previously attached ViewGroup was not properly detached.")
     }
 
-    viewGroup?.let {
+    viewGroup?.let { reactPlayerGroup ->
       globalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
-        it.post {
-          it.layout(0, 0, viewGroup.width, viewGroup.height)
+        val root = getRootViewFrom(reactPlayerGroup)
+        reactPlayerGroup.post {
+          applyOnViewTree(reactPlayerGroup) { view ->
+            if (view == reactPlayerGroup || view is ReactTHEOplayerView) {
+              view.measure(
+                View.MeasureSpec.makeMeasureSpec(root.width, View.MeasureSpec.EXACTLY),
+                View.MeasureSpec.makeMeasureSpec(root.height, View.MeasureSpec.EXACTLY)
+              )
+              view.layout(0, 0, view.measuredWidth, view.measuredHeight)
+            }
+          }
         }
       }
-      it.viewTreeObserver.addOnGlobalLayoutListener(globalLayoutListener)
+      reactPlayerGroup.viewTreeObserver.addOnGlobalLayoutListener(globalLayoutListener)
       attached = viewGroup
     }
   }
@@ -37,3 +51,24 @@ class FullScreenLayoutObserver {
     globalLayoutListener = null
   }
 }
+
+/**
+ * Find the view root, most likely the decorView
+ */
+fun getRootViewFrom(view: View): View {
+  var current = view
+  while (current.parent is View) {
+    current = current.parent as View
+  }
+  return current
+}
+
+/**
+ * Conditionally apply an operation on each view in a hierarchy.
+ */
+fun applyOnViewTree(view: View, doOp: (View) -> Unit) {
+  doOp(view)
+  if (view is ViewGroup) {
+    view.children.forEach { ch -> applyOnViewTree(ch, doOp) }
+  }
+}

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

@@ -26,6 +26,12 @@ import com.theoplayer.android.api.error.ErrorCode
 import com.theoplayer.android.api.error.THEOplayerException
 import com.theoplayer.android.api.player.PresentationMode
 
+const val IS_TRANSITION_INTO_PIP = "isTransitioningToPip"
+const val IS_IN_PIP_MODE = "isInPictureInPictureMode"
+const val ON_USER_LEAVE_HINT = "onUserLeaveHint"
+const val ON_PIP_MODE_CHANGED = "onPictureInPictureModeChanged"
+
+@Suppress("KotlinConstantConditions", "SimplifyBooleanWithConstants")
 @SuppressLint("UnspecifiedRegisterReceiverFlag")
 class PresentationManager(
   private val viewCtx: ReactTHEOplayerContext,
@@ -34,34 +40,28 @@ class PresentationManager(
 ) {
   private var supportsPip = false
   private var onUserLeaveHintReceiver: BroadcastReceiver? = null
+  private var onUserLeaveHintRunnable: Runnable = Runnable {
+    if (pipConfig.startsAutomatically == true) {
+      setPresentation(PresentationMode.PICTURE_IN_PICTURE)
+    }
+  }
   private var onPictureInPictureModeChanged: BroadcastReceiver? = null
   private val pipUtils: PipUtils = PipUtils(viewCtx, reactContext)
   private val fullScreenLayoutObserver = FullScreenLayoutObserver()
   private val playerGroupRestoreOptions by lazy {
     PlayerGroupRestoreOptions()
   }
-
   var currentPresentationMode: PresentationMode = PresentationMode.INLINE
     private set
   var currentPresentationModeChangeContext: PresentationModeChangeContext? = null
     private set
-
   var pipConfig: PipConfig = PipConfig()
 
   init {
-    onUserLeaveHintReceiver = object : BroadcastReceiver() {
-      override fun onReceive(context: Context?, intent: Intent?) {
-        // Optionally into PiP mode when the app goes to background.
-        if (pipConfig.startsAutomatically == true) {
-          setPresentation(PresentationMode.PICTURE_IN_PICTURE)
-        }
-      }
-    }
     onPictureInPictureModeChanged = object : BroadcastReceiver() {
       override fun onReceive(context: Context?, intent: Intent?) {
-        val transitioningToPip = intent
-          ?.getBooleanExtra("isTransitioningToPip", false) ?: false
-        val inPip = intent?.getBooleanExtra("isInPictureInPictureMode", false) ?: false
+        val transitioningToPip = intent?.getBooleanExtra(IS_TRANSITION_INTO_PIP, false) ?: false
+        val inPip = intent?.getBooleanExtra(IS_IN_PIP_MODE, false) ?: false
         // Dispatch event on every PiP mode change
         when {
           transitioningToPip -> onEnterPip(true)
@@ -75,35 +75,50 @@ class PresentationManager(
         reactContext.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      reactContext.currentActivity?.registerReceiver(
-        onUserLeaveHintReceiver, IntentFilter("onUserLeaveHint"), Context.RECEIVER_EXPORTED
-      )
-    } else {
-      reactContext.currentActivity?.registerReceiver(
-        onUserLeaveHintReceiver, IntentFilter("onUserLeaveHint")
-      )
-    }
+    reactContext.currentActivity?.let { activity ->
+      // On Android 16+, the broadcasted onUserLeaveHint comes too late to activate PiP presentation
+      // mode, and the activity will not go into PiP when the user backgrounds the app. In this case
+      // we rely on the newer addOnUserLeaveHintListener and ignore the broadcast event.
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+        onUserLeaveHintReceiver = object : BroadcastReceiver() {
+          override fun onReceive(context: Context?, intent: Intent?) {
+            onUserLeaveHintRunnable.run()
+          }
+        }
+      } else {
+        (activity as? ComponentActivity)?.addOnUserLeaveHintListener(onUserLeaveHintRunnable)
+      }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      reactContext.currentActivity?.registerReceiver(
-        onPictureInPictureModeChanged, IntentFilter("onPictureInPictureModeChanged"),
-        Context.RECEIVER_EXPORTED
-      )
-    } else {
-      reactContext.currentActivity?.registerReceiver(
-        onPictureInPictureModeChanged, IntentFilter("onPictureInPictureModeChanged")
-      )
+      @SuppressLint("UnspecifiedRegisterReceiverFlag")
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        activity.registerReceiver(
+          onUserLeaveHintReceiver,
+          IntentFilter(ON_USER_LEAVE_HINT),
+          Context.RECEIVER_EXPORTED
+        )
+        activity.registerReceiver(
+          onPictureInPictureModeChanged,
+          IntentFilter(ON_PIP_MODE_CHANGED),
+          Context.RECEIVER_EXPORTED
+        )
+      } else {
+        activity.registerReceiver(onUserLeaveHintReceiver, IntentFilter(ON_USER_LEAVE_HINT))
+        activity.registerReceiver(onPictureInPictureModeChanged, IntentFilter(ON_PIP_MODE_CHANGED))
+      }
     }
   }
 
   fun destroy() {
     try {
-      reactContext.currentActivity?.unregisterReceiver(onUserLeaveHintReceiver)
-      reactContext.currentActivity?.unregisterReceiver(onPictureInPictureModeChanged)
+      reactContext.currentActivity?.let { activity ->
+        activity.unregisterReceiver(onUserLeaveHintReceiver)
+        (activity as? ComponentActivity)?.addOnUserLeaveHintListener(onUserLeaveHintRunnable)
+        activity.unregisterReceiver(onPictureInPictureModeChanged)
+      }
+
       fullScreenLayoutObserver.remove()
       pipUtils.destroy()
-    } catch (ignore: Exception) {
+    } catch (_: Exception) {
     }
   }
 
@@ -126,62 +141,60 @@ class PresentationManager(
 
   private fun enterPip() {
     // PiP not supported
-    if (!supportsPip || Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-      return
-    }
+    if (!supportsPip || Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
 
     // Already in right PiP state?
-    if (currentPresentationMode == PresentationMode.PICTURE_IN_PICTURE) {
-      return
-    }
+    if (currentPresentationMode == PresentationMode.PICTURE_IN_PICTURE) return
 
     // Check to see whether this activity is in the process of finishing, either because you
     // called finish on it or someone else has requested that it finished.
-    if (reactContext.currentActivity?.isFinishing == true) {
-      return
-    }
+    if (reactContext.currentActivity?.isFinishing == true) return
 
     // Check whether the special permission Picture-in-Picture is given.
-    if (!hasPipPermission()) {
-      return
-    }
+    if (!hasPipPermission()) return
 
     try {
       pipUtils.enable()
       reactContext.currentActivity?.enterPictureInPictureMode(pipUtils.getPipParams())
-      if (BuildConfig.REPARENT_ON_PIP && pipConfig.reparentPip == true) {
-        reparentPlayerToRoot()
-      }
     } catch (_: Exception) {
       onPipError()
     }
   }
 
+  /**
+   * Called when the transition into PiP either starts (transitioningToPip = true)
+   * or after it ends (transitioningToPip = false)
+   */
   private fun onEnterPip(transitioningToPip: Boolean = false) {
+    if (BuildConfig.REPARENT_ON_PIP && !transitioningToPip && pipConfig.reparentPip == true) {
+      reparentPlayerToRoot()
+    }
+
     updatePresentationMode(
       PresentationMode.PICTURE_IN_PICTURE,
-      if (transitioningToPip)
-        PresentationModeChangeContext(PresentationModeChangePipContext.TRANSITIONING_TO_PIP)
+      if (transitioningToPip) PresentationModeChangeContext(PresentationModeChangePipContext.TRANSITIONING_TO_PIP)
       else null
     )
   }
 
+  /**
+   * Called when the PiP exit transition starts.
+   */
   private fun onExitPip() {
     val pipCtx: PresentationModeChangePipContext =
-      if ((reactContext.currentActivity as? ComponentActivity)
-          ?.lifecycle?.currentState == Lifecycle.State.CREATED
-      ) {
+      if ((reactContext.currentActivity as? ComponentActivity)?.lifecycle?.currentState == Lifecycle.State.CREATED) {
         PresentationModeChangePipContext.CLOSED
       } else {
         PresentationModeChangePipContext.RESTORED
       }
-    if (BuildConfig.REPARENT_ON_PIP) {
+    if (BuildConfig.REPARENT_ON_PIP && pipConfig.reparentPip == true) {
       reparentPlayerToOriginal()
     }
     updatePresentationMode(PresentationMode.INLINE, PresentationModeChangeContext(pipCtx))
     pipUtils.disable()
   }
 
+  @Suppress("DEPRECATION")
   private fun hasPipPermission(): Boolean {
     val appOps = reactContext.getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager?
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -192,7 +205,6 @@ class PresentationManager(
           reactContext.packageName
         ) == AppOpsManager.MODE_ALLOWED
       } else {
-        @Suppress("DEPRECATION")
         appOps?.checkOpNoThrow(
           AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
           reactContext.applicationInfo.uid,
@@ -210,9 +222,7 @@ class PresentationManager(
   }
 
   private fun setFullscreen(fullscreen: Boolean) {
-    if ((fullscreen && currentPresentationMode == PresentationMode.FULLSCREEN) ||
-      (!fullscreen && currentPresentationMode == PresentationMode.INLINE)
-    ) {
+    if ((fullscreen && currentPresentationMode == PresentationMode.FULLSCREEN) || (!fullscreen && currentPresentationMode == PresentationMode.INLINE)) {
       return
     }
     val activity = reactContext.currentActivity ?: return
@@ -254,8 +264,7 @@ class PresentationManager(
       val activity = reactContext.currentActivity ?: return null
       // Try to search in parents and as a fallback option from root to bottom using depth-first order
       return reactPlayerGroup?.getClosestParentOfType()
-        ?: (activity.window.decorView.rootView as? ViewGroup)
-          ?.getClosestParentOfType(false)
+        ?: (activity.window.decorView.rootView as? ViewGroup)?.getClosestParentOfType(false)
     }
 
   private fun reparentPlayerToRoot() {
@@ -281,7 +290,9 @@ class PresentationManager(
 
         // Re-parent the playerViewGroup from the root node to its original parent
         removeView(playerGroup)
-        playerGroupRestoreOptions.parentNode?.addView(playerGroup, playerGroupRestoreOptions.childIndex ?: 0)
+        playerGroupRestoreOptions.parentNode?.addView(
+          playerGroup, playerGroupRestoreOptions.childIndex ?: 0
+        )
         playerGroupRestoreOptions.reset()
       }
     }
@@ -289,12 +300,9 @@ class PresentationManager(
 // endregion
 
   private fun updatePresentationMode(
-    presentationMode: PresentationMode,
-    context: PresentationModeChangeContext? = null
+    presentationMode: PresentationMode, context: PresentationModeChangeContext? = null
   ) {
-    if (presentationMode == currentPresentationMode &&
-      context == currentPresentationModeChangeContext
-    ) {
+    if (presentationMode == currentPresentationMode && context == currentPresentationModeChangeContext) {
       return
     }
     val prevPresentationMode = currentPresentationMode

package/android/src/main/java/com/theoplayer/source/SourceAdapter.kt

@@ -2,6 +2,7 @@ package com.theoplayer.source
 
 import android.text.TextUtils
 import android.util.Log
+import androidx.core.net.toUri
 import com.google.gson.Gson
 import com.theoplayer.android.api.ads.theoads.TheoAdDescription
 import com.theoplayer.android.api.error.THEOplayerException
@@ -271,38 +272,17 @@ class SourceAdapter {
   private fun parseSourceType(jsonTypedSource: JSONObject): SourceType? {
     val type = jsonTypedSource.optString(PROP_TYPE)
     if (type.isNotEmpty()) {
-      if ("application/dash+xml" == type) {
-        return SourceType.DASH
-      }
-      if ("application/x-mpegurl" == type) {
-        return SourceType.HLSX
-      }
-      if ("application/vnd.theo.hesp+json" == type) {
-        return SourceType.HESP
-      }
-      if ("application/vnd.apple.mpegurl" == type) {
-        return SourceType.HLS
-      }
-      if ("video/mp4" == type) {
-        return SourceType.MP4
-      }
-      if ("audio/mpeg" == type) {
-        return SourceType.MP3
-      }
+      SourceType.entries.find { it.mimeType == type }?.let { return it }
     } else {
       // No type given, check for known extension.
-      val src = jsonTypedSource.optString(PROP_SRC)
-      if (src.endsWith(".mpd")) {
-        return SourceType.DASH
-      }
-      if (src.endsWith(".m3u8")) {
-        return SourceType.HLSX
-      }
-      if (src.endsWith(".mp4")) {
-        return SourceType.MP4
-      }
-      if (src.endsWith(".mp3")) {
-        return SourceType.MP3
+      val src = jsonTypedSource.optString(PROP_SRC).toUri()
+      src.lastPathSegment?.let { fileName ->
+        when {
+          fileName.endsWith(".mpd") -> return SourceType.DASH
+          fileName.endsWith(".m3u8") -> return SourceType.HLSX
+          fileName.endsWith(".mp4") -> return SourceType.MP4
+          fileName.endsWith(".mp3") -> return SourceType.MP3
+        }
       }
     }
     return null
@@ -366,7 +346,7 @@ class SourceAdapter {
       overrideLayout = parseOverrideLayout(jsonAdDescription.optString(PROP_OVERRIDE_LAYOUT)),
       useId3 = jsonAdDescription.optBoolean(PROP_USE_ID3, false),
       retrievePodIdURI = jsonAdDescription.optString(PROP_RETRIEVE_POD_ID_URI).takeIf { it.isNotEmpty() },
-      initializationDelay = jsonAdDescription.optDouble(PROP_INITIALIZATION_DELAY),
+      initializationDelay = jsonAdDescription.optDouble(PROP_INITIALIZATION_DELAY).takeIf { it.isFinite() },
       sseEndpoint = jsonAdDescription.optString(PROP_SSE_ENDPOINT).takeIf { it.isNotEmpty() },
     )
   }

package/android/src/main/java/com/theoplayer/theolive/EndpointAdapter.kt

@@ -10,12 +10,12 @@ import com.theoplayer.android.api.theolive.KeySystemConfiguration
 private const val PROP_HESP_SRC = "hespSrc"
 private const val PROP_HLS_SRC = "hlsSrc"
 private const val PROP_AD_SRC = "adSrc"
+private const val PROP_CDN = "cdn"
 private const val PROP_TARGET_LATENCY = "targetLatency"
 private const val PROP_WEIGHT = "weight"
 private const val PROP_PRIORITY = "priority"
 private const val PROP_CONTENT_PROTECTION = "contentProtection"
 private const val PROP_INTEGRATION = "integration"
-
 private const val PROP_WIDEVINE = "widevine"
 private const val PROP_PLAYREADY = "playready"
 private const val PROP_FAIRPLAY = "fairplay"
@@ -29,6 +29,7 @@ object EndpointAdapter {
       endPoint.hespSrc?.let { putString(PROP_HESP_SRC, it) }
       endPoint.hlsSrc?.let { putString(PROP_HLS_SRC, it) }
       endPoint.adSrc?.let { putString(PROP_AD_SRC, it) }
+      endPoint.cdn?.let { putString(PROP_CDN, it) }
       endPoint.targetLatency?.let { putDouble(PROP_TARGET_LATENCY, it) }
       putInt(PROP_WEIGHT, endPoint.weight)
       putInt(PROP_PRIORITY, endPoint.priority)

package/android/src/main/java/com/theoplayer/theolive/THEOliveEventAdapter.kt

@@ -8,11 +8,12 @@ import com.theoplayer.android.api.event.player.theolive.EndpointLoadedEvent
 import com.theoplayer.android.api.event.player.theolive.IntentToFallbackEvent
 import com.theoplayer.android.api.event.player.theolive.TheoLiveEventTypes
 import com.theoplayer.android.api.player.theolive.TheoLive
+import com.theoplayer.util.PayloadBuilder
 
 private const val EVENT_PROP_TYPE = "type"
-
 private const val EVENT_PROP_DISTRIBUTION_ID = "distributionId"
 private const val EVENT_PROP_ENDPOINT = "endpoint"
+private const val EVENT_PROP_REASON = "reason"
 
 class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitter: Emitter) {
 
@@ -55,9 +56,12 @@ class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitte
     })
   }
 
-  private fun onIntentOfFallback(_event: IntentToFallbackEvent) {
+  private fun onIntentOfFallback(event: IntentToFallbackEvent) {
     emitter.emit(Arguments.createMap().apply {
       putString(EVENT_PROP_TYPE, "intenttofallback")
+      event.reason?.let {
+        putMap(EVENT_PROP_REASON, PayloadBuilder().error(it.code.id.toString(), it.message).build())
+      }
     })
   }
 }