react-native-theoplayer 8.16.0 → 8.18.0

package/CHANGELOG.md

@@ -5,6 +5,38 @@ 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).
 
+## [8.18.0] - 25-04-02
+
+### Changed
+
+- No longer showing poster after setting the source when the player has been configured to use autoplay. With autoplay enabled, displaying the poster will only result in a brief flash of the image.
+- Changed the fullscreen screen dimension calculation on Android, taking into account edgeToEdge layouts.
+
+### Added
+
+- Exposed THEOads API through the Player API.
+- Added support for Common Media Client Data (CMCD) on all platforms. More info on the [documentation](./doc/cmcd.md) page.
+
+### Fixed
+
+- Fixed an issue on Android where the transition to a PiP window would not focus on the player window.
+
+## [8.17.0] - 25-03-20
+
+### Fixed
+
+- Fixed an issue on Web where the metadata on the lockscreen was not showing correctly or missing occasionally.
+- Fixed a crash on Android when setting a source with THEOads without the Media3 extension being enabled.
+- Fixed an issue on iOS where the AdTapped and AdClicked events were not correctly cleaned up.
+- Fixed an issue on Android where the player would sometimes crash when passing a DRM protected source without an `integration` property.
+
+### Added
+
+- Added SeekTo functionality to the web lockscreen controls, allowing to drag the lockscreen slider and seek to a specific time value.
+- Added the IMA DAI `streamActivityMonitorId` property as a configuration on the SGAI `TheoAdDescription` for web.
+- Added the THEOads API for Web.
+- Added `retrievePodIdURI` property to `TheoAdsDescription` for Android and iOS.
+
 ## [8.16.0] - 25-02-28
 
 ### Changed
@@ -18,6 +50,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed an issue on Android, where the player would sometimes not initialise correctly in case New Architecture was not being used, resulting in a black screen.
 - Fixed an issue on iOS Safari browsers, where the `presentationmodechange` event would not be dispatched when entering or exiting fullscreen.
 
+
 ## [8.15.0] - 25-02-12
 
 ### Changed

package/README.md

@@ -105,7 +105,7 @@ please reach out to us for support.
 </tr>
 <tr>
 <td><strong>Advertising Integration</strong></td>
-<td colspan="3">Google IMA, Google DAI</td>
+<td colspan="3">Google IMA, Google DAI, THEOads</td>
 </tr>
 <tr>
 <td><strong>Cast Integration</strong></td>
@@ -174,9 +174,11 @@ This section gives an overview of features, limitations and known issues:
 
 - [Adaptive Bitrate (ABR)](./doc/abr.md)
 - [Advertisements](./doc/ads.md)
+- [Android Media3 Pipeline🔥](./doc/media3.md)
 - [Audio Control Management](./doc/audio-control.md)
 - [Background playback and notifications](./doc/background.md)
 - [Casting with Chromecast and Airplay](./doc/cast.md)
+- [Common Media Client Data (CMCD)](./doc/cmcd.md)
 - [Digital Rights Management (DRM)](./doc/drm.md)
 - [Fullscreen presentation](./doc/fullscreen.md)
 - [Media Caching](./doc/media-caching.md)

package/android/build.gradle

@@ -59,8 +59,9 @@ android {
     def TimeUpdateRate = "com.theoplayer.TimeUpdateRate"
     buildConfigField TimeUpdateRate, "TIMEUPDATE_RATE", safeExtGet('THEOplayer_timeUpdateRate', "${TimeUpdateRate}.UNLIMITED")
 
-    // Optionally re-parent player view on fullscreen event
+    // Optionally re-parent player view on fullscreen or PiP event
     buildConfigField "boolean", "REPARENT_ON_FULLSCREEN", "${safeExtGet('THEOplayer_reparent_on_fullscreen', 'true')}"
+    buildConfigField "boolean", "REPARENT_ON_PIP", "${safeExtGet('THEOplayer_reparent_on_PiP', 'false')}"
 
     // Optionally log events to logcat
     buildConfigField "boolean", "LOG_PLAYER_EVENTS", "${safeExtGet('THEOplayer_logPlayerEvents', 'false')}"

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

@@ -346,7 +346,8 @@ class ReactTHEOplayerContext private constructor(
             // return false -> the default pipeline will be used to play the selected source.
             //
             // @remark If the source contains THEOads, media3 is always enabled.
-            configAdapter.useMedia3 || source.ads.any { it is TheoAdDescription }
+            configAdapter.useMedia3 ||
+              (BuildConfig.EXTENSION_THEOADS && source.ads.any { it is TheoAdDescription })
           }
         playerView.player.addIntegration(media3Integration)
       }

package/android/src/main/java/com/theoplayer/cmcd/CmcdTransmissionMode.kt

@@ -0,0 +1,8 @@
+package com.theoplayer.cmcd
+
+enum class CmcdTransmissionMode {
+  HTTP_HEADER,
+  QUERY_ARGUMENT,
+  JSON_OBJECT,
+  SDK_DEFAULT
+}

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

@@ -12,7 +12,9 @@ import com.theoplayer.android.api.contentprotection.Response
 import com.theoplayer.android.api.source.drm.DRMConfiguration
 import com.theoplayer.android.api.source.drm.DRMIntegrationId
 import com.theoplayer.android.api.source.drm.KeySystemConfiguration
+import com.theoplayer.android.api.source.drm.LicenseType
 import com.theoplayer.android.api.source.drm.preintegration.*
+import com.theoplayer.util.BridgeUtils.fromJSONObjectToMap
 import org.json.JSONObject
 
 private const val TAG = "ContentProtection"
@@ -23,6 +25,7 @@ const val PROP_INTEGRATION_PARAMETERS: String = "integrationParameters"
 const val PROP_REQUEST: String = "request"
 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_REQUEST_ID: String = "requestId"
 const val PROP_URL: String = "url"
@@ -33,6 +36,12 @@ const val PROP_HEADERS: String = "headers"
 const val PROP_BASE64_BODY: String = "base64body"
 const val PROP_LA_URL: String = "licenseAcquisitionURL"
 const val PROP_USE_CREDENTIALS: String = "useCredentials"
+const val PROP_LICENSE_ACQUISITION_URL: String = "licenseAcquisitionURL"
+const val PROP_LICENSE_TYPE: String = "licenseType"
+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"
 
 object ContentProtectionAdapter {
 
@@ -76,21 +85,42 @@ object ContentProtectionAdapter {
     // Custom integration through connector
     return DRMConfiguration.Builder().apply {
       if (!TextUtils.isEmpty(integration)) {
-        this.customIntegrationId(integration)
+        customIntegrationId(integration)
+      }
+      if (jsonConfig.has(PROP_WIDEVINE)) {
+        widevine(keySystemConfigurationFromJson(jsonConfig.getJSONObject(PROP_WIDEVINE)))
+      }
+      if (jsonConfig.has(PROP_PLAYREADY)) {
+        playready(keySystemConfigurationFromJson(jsonConfig.getJSONObject(PROP_PLAYREADY)))
       }
-      this.widevine(gson.fromJson(jsonConfig.optString("widevine"), KeySystemConfiguration::class.java))
-      this.playready(gson.fromJson(jsonConfig.optString("playready"), KeySystemConfiguration::class.java))
       if (jsonConfig.has(PROP_INTEGRATION_PARAMETERS)) {
-        this.integrationParameters(
-          gson.fromJson<Map<String, Any>>(
-            jsonConfig.getJSONObject(PROP_INTEGRATION_PARAMETERS).toString(),
-            MutableMap::class.java
-          )
-        )
+        integrationParameters(fromJSONObjectToMap(jsonConfig.getJSONObject(PROP_INTEGRATION_PARAMETERS)))
+      }
+    }.build()
+  }
+
+  private fun keySystemConfigurationFromJson(config: JSONObject): KeySystemConfiguration {
+    return KeySystemConfiguration.Builder(config.optString(PROP_LICENSE_ACQUISITION_URL)).apply {
+      useCredentials(config.optBoolean(PROP_USE_CREDENTIALS))
+      licenseTypeFromString(config.optString(PROP_LICENSE_TYPE))?.let {
+        licenseType(it)
+      }
+      headers(fromJSONObjectToMap(config.optJSONObject(PROP_HEADERS)))
+      queryParameters(fromJSONObjectToMap(config.optJSONObject(PROP_QUERY_PARAMETERS)))
+      if (config.has(PROP_CERTIFICATE)) {
+        certificate(config.getString(PROP_CERTIFICATE).toByteArray())
       }
     }.build()
   }
 
+  private fun licenseTypeFromString(str: String?): LicenseType? {
+    return when (str) {
+      PROP_LICENSE_TYPE_PERSISTENT -> LicenseType.PERSISTENT
+      PROP_LICENSE_TYPE_TEMPORARY -> LicenseType.TEMPORARY
+      else -> null
+    }
+  }
+
   fun fromDRMConfiguration(config: DRMConfiguration): WritableMap {
     return Arguments.createMap().apply {
       putString(PROP_INTEGRATION, config.customIntegrationId ?: config.integration.integrationId)

package/android/src/main/java/com/theoplayer/player/PlayerModule.kt

@@ -263,4 +263,17 @@ class PlayerModule(context: ReactApplicationContext) : ReactContextBaseJavaModul
       )
     }
   }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun getUsableScreenDimensions(): WritableMap {
+    // Pass the dimensions of the top-most View in the view hierarchy.
+    val topView = reactApplicationContext.currentActivity?.window?.decorView?.rootView
+    reactApplicationContext.resources.displayMetrics.also {
+      val density = it.density
+      return Arguments.createMap().apply {
+        putDouble("width", (topView?.width ?: 0) / density.toDouble())
+        putDouble("height", (topView?.height ?: 0) / density.toDouble())
+      }
+    }
+  }
 }

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

@@ -0,0 +1,39 @@
+package com.theoplayer.presentation
+
+import android.util.Log
+import android.view.ViewTreeObserver
+import com.facebook.react.views.view.ReactViewGroup
+
+private 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
+ * position & size.
+ */
+class FullScreenLayoutObserver {
+  private var globalLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
+  private var attached: ReactViewGroup? = null
+
+  fun attach(viewGroup: ReactViewGroup?) {
+    if (attached != null) {
+      Log.w(TAG, "A previously attached ViewGroup was not properly detached.")
+    }
+
+    viewGroup?.let {
+      globalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
+        it.post {
+          it.layout(0, 0, viewGroup.width, viewGroup.height)
+        }
+      }
+      it.viewTreeObserver.addOnGlobalLayoutListener(globalLayoutListener)
+      attached = viewGroup
+    }
+  }
+
+  fun remove() {
+    attached?.viewTreeObserver?.removeOnGlobalLayoutListener(globalLayoutListener)
+    attached = null
+    globalLayoutListener = null
+  }
+}

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

@@ -12,9 +12,6 @@ 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
@@ -108,7 +105,8 @@ class PipUtils(
     }
     try {
       reactContext.currentActivity?.unregisterReceiver(broadcastReceiver)
-    } catch (ignore: IllegalArgumentException) { /*ignore*/}
+    } catch (ignore: IllegalArgumentException) { /*ignore*/
+    }
     enabled = false
   }
 
@@ -189,17 +187,13 @@ class PipUtils(
   }
 
   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 view.findViewById<ViewGroup>(com.theoplayer.android.R.id.theo_content_player_container)
+      ?.getChildAt(0) // AspectRatioView
+      ?.run {
+        Rect().apply {
+          getGlobalVisibleRect(this)
+        }
       }
-    }
-    return null
   }
 
   @RequiresApi(Build.VERSION_CODES.O)

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

@@ -14,9 +14,9 @@ import android.view.ViewParent
 import androidx.activity.ComponentActivity
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.children
 import androidx.lifecycle.Lifecycle
 import com.facebook.react.ReactRootView
-import com.facebook.react.runtime.ReactSurfaceView
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.theoplayer.BuildConfig
@@ -35,9 +35,11 @@ class PresentationManager(
   private var supportsPip = false
   private var onUserLeaveHintReceiver: BroadcastReceiver? = null
   private var onPictureInPictureModeChanged: BroadcastReceiver? = null
-  private var playerGroupParentNode: ViewGroup? = null
-  private var playerGroupChildIndex: Int? = 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
@@ -99,6 +101,7 @@ class PresentationManager(
     try {
       reactContext.currentActivity?.unregisterReceiver(onUserLeaveHintReceiver)
       reactContext.currentActivity?.unregisterReceiver(onPictureInPictureModeChanged)
+      fullScreenLayoutObserver.remove()
       pipUtils.destroy()
     } catch (ignore: Exception) {
     }
@@ -146,6 +149,9 @@ class PresentationManager(
     try {
       pipUtils.enable()
       reactContext.currentActivity?.enterPictureInPictureMode(pipUtils.getPipParams())
+      if (BuildConfig.REPARENT_ON_PIP) {
+        reparentPlayerToRoot()
+      }
     } catch (_: Exception) {
       onPipError()
     }
@@ -169,6 +175,9 @@ class PresentationManager(
       } else {
         PresentationModeChangePipContext.RESTORED
       }
+    if (BuildConfig.REPARENT_ON_PIP) {
+      reparentPlayerToOriginal()
+    }
     updatePresentationMode(PresentationMode.INLINE, PresentationModeChangeContext(pipCtx))
     pipUtils.disable()
   }
@@ -209,30 +218,23 @@ class PresentationManager(
     val activity = reactContext.currentActivity ?: return
     val window = activity.window
 
-    // Get the player's ReactViewGroup parent, which contains THEOplayerView and its children (typically the UI).
-    val reactPlayerGroup: ReactViewGroup? = getClosestParentOfType(this.viewCtx.playerView)
-
-    // Get ReactNative's root node or the render hierarchy
-    val root: ReactRootView? = getClosestParentOfType(reactPlayerGroup)
-
     if (fullscreen) {
+      // Hide system bars for immersive mode.
+      // {@link https://developer.android.com/develop/ui/views/layout/immersive}
       WindowInsetsControllerCompat(window, window.decorView).apply {
+        // Reveal hidden system bars on any system gestures.
         systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-      }.hide(WindowInsetsCompat.Type.systemBars())
-      updatePresentationMode(PresentationMode.FULLSCREEN)
+        // Hide all system bars.
+        hide(WindowInsetsCompat.Type.systemBars())
+      }
 
-      if (!BuildConfig.REPARENT_ON_FULLSCREEN) {
-        return
+      // Delay the event making sure it does not arrive before animations ended.
+      viewCtx.playerView.postOnAnimation {
+        updatePresentationMode(PresentationMode.FULLSCREEN)
       }
-      playerGroupParentNode = if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-        reactPlayerGroup?.parent as? ReactSurfaceView?
-      } else {
-        reactPlayerGroup?.parent as? ReactViewGroup?
-      }?.also { parent ->
-        playerGroupChildIndex = parent.indexOfChild(reactPlayerGroup)
-        // Re-parent the playerViewGroup to the root node
-        parent.removeView(reactPlayerGroup)
-        root?.addView(reactPlayerGroup)
+
+      if (BuildConfig.REPARENT_ON_FULLSCREEN) {
+        reparentPlayerToRoot()
       }
     } else {
       WindowInsetsControllerCompat(window, window.decorView).show(
@@ -240,18 +242,54 @@ class PresentationManager(
       )
       updatePresentationMode(PresentationMode.INLINE)
 
-      if (!BuildConfig.REPARENT_ON_FULLSCREEN) {
-        return
+      if (BuildConfig.REPARENT_ON_FULLSCREEN) {
+        reparentPlayerToOriginal()
       }
-      root?.run {
+    }
+  }
+
+  // region Re-parent playerViewGroup logic
+  private val reactPlayerGroup: ReactViewGroup?
+    get() = viewCtx.playerView.getClosestParentOfType()
+
+  private val rootView: ReactRootView?
+    get() {
+      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)
+    }
+
+  private fun reparentPlayerToRoot() {
+    reactPlayerGroup?.let { playerGroup ->
+      playerGroupRestoreOptions.parentNode = (playerGroup.parent as? ViewGroup)?.also { parent ->
+        playerGroupRestoreOptions.childIndex = parent.indexOfChild(playerGroup)
+
+        // Re-parent the playerViewGroup to the root node
+        parent.removeView(playerGroup)
+        rootView?.addView(playerGroup)
+
+        // Attach an observer that overrides the react-native lay-out and forces fullscreen.
+        fullScreenLayoutObserver.attach(playerGroup)
+      }
+    }
+  }
+
+  private fun reparentPlayerToOriginal() {
+    rootView?.run {
+      reactPlayerGroup?.let { playerGroup ->
+        // Remove forced layout observer
+        fullScreenLayoutObserver.remove()
+
         // Re-parent the playerViewGroup from the root node to its original parent
-        removeView(reactPlayerGroup)
-        playerGroupParentNode?.addView(reactPlayerGroup, playerGroupChildIndex ?: 0)
-        playerGroupParentNode = null
-        playerGroupChildIndex = null
+        removeView(playerGroup)
+        playerGroupRestoreOptions.parentNode?.addView(playerGroup, playerGroupRestoreOptions.childIndex ?: 0)
+        playerGroupRestoreOptions.reset()
       }
     }
   }
+// endregion
 
   private fun updatePresentationMode(
     presentationMode: PresentationMode,
@@ -279,10 +317,41 @@ class PresentationManager(
   }
 }
 
-inline fun <reified T : View> getClosestParentOfType(view: View?): T? {
-  var parent: ViewParent? = view?.parent
-  while (parent != null && parent !is T) {
-    parent = parent.parent
+inline fun <reified T : View> ViewGroup.getClosestParentOfType(upward: Boolean = true): T? {
+  if (upward) {
+    // Search in the parent views of `this` view up to the root
+    var parent: ViewParent? = parent
+    while (parent != null && parent !is T) {
+      parent = parent.parent
+    }
+    return parent as? T
+  } else {
+    // Search in the children collection.
+    val viewStack = ArrayDeque(children.toList())
+    // Use Stack/LIFO instead of recursion
+    while (viewStack.isNotEmpty()) {
+      when (val view = viewStack.removeAt(0)) {
+        is T -> {
+          return view
+        }
+
+        is ViewGroup -> {
+          // Filling LIFO with all children of the ViewGroup: depth-first order
+          viewStack.addAll(0, view.children.toList())
+        }
+      }
+    }
+    // Found nothing
+    return null
+  }
+}
+
+private class PlayerGroupRestoreOptions {
+  var childIndex: Int? = null
+  var parentNode: ViewGroup? = null
+
+  fun reset() {
+    parentNode = null
+    childIndex = null
   }
-  return parent as? T
 }

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

@@ -19,10 +19,12 @@ import com.theoplayer.android.api.player.track.texttrack.TextTrackKind
 import com.theoplayer.android.api.source.metadata.ChromecastMetadataImage
 import com.theoplayer.BuildConfig
 import com.theoplayer.android.api.ads.theoads.TheoAdsLayoutOverride
+import com.theoplayer.android.api.cmcd.CMCDTransmissionMode
 import com.theoplayer.android.api.error.ErrorCode
 import com.theoplayer.android.api.source.AdIntegration
 import com.theoplayer.android.api.source.dash.DashPlaybackConfiguration
 import com.theoplayer.android.api.theolive.TheoLiveSource
+import com.theoplayer.cmcd.CmcdTransmissionMode
 import com.theoplayer.drm.ContentProtectionAdapter
 import com.theoplayer.latency.parseLatencyConfiguration
 import com.theoplayer.util.BridgeUtils
@@ -63,6 +65,7 @@ private const val PROP_CUSTOM_ASSET_KEY = "customAssetKey"
 private const val PROP_OVERRIDE_LAYOUT = "overrideLayout"
 private const val PROP_NETWORK_CODE = "networkCode"
 private const val PROP_USE_ID3 = "useId3"
+private const val PROP_RETRIEVE_POD_ID_URI = "retrievePodIdURI"
 private const val PROP_LATENCY_CONFIGURATION = "latencyConfiguration"
 
 private const val ERROR_IMA_NOT_ENABLED = "Google IMA support not enabled."
@@ -74,6 +77,9 @@ private const val PROP_SSAI_INTEGRATION_GOOGLE_DAI = "google-dai"
 
 private const val INTEGRATION_THEOLIVE = "theolive"
 
+private const val PROP_CMCD = "cmcd"
+private const val CMCD_TRANSMISSION_MODE = "transmissionMode"
+
 class SourceAdapter {
   private val gson = Gson()
 
@@ -94,6 +100,12 @@ class SourceAdapter {
     try {
       val jsonSourceObject = JSONObject(gson.toJson(source.toHashMap()))
 
+      // CMCD
+      var cmcdTransmissionMode: CMCDTransmissionMode? = null
+      if (jsonSourceObject.has(PROP_CMCD)) {
+        cmcdTransmissionMode = parseCmcdTransmissionMode(jsonSourceObject.getJSONObject(PROP_CMCD));
+      }
+
       // typed sources
       val typedSources = ArrayList<TypedSource>()
 
@@ -101,11 +113,11 @@ class SourceAdapter {
       val jsonSources = jsonSourceObject.optJSONArray(PROP_SOURCES)
       if (jsonSources != null) {
         for (i in 0 until jsonSources.length()) {
-          typedSources.add(parseTypedSource(jsonSources[i] as JSONObject))
+          typedSources.add(parseTypedSource(jsonSources[i] as JSONObject, cmcdTransmissionMode))
         }
       } else {
         val jsonSource = jsonSourceObject.optJSONObject(PROP_SOURCES) ?: return null
-        typedSources.add(parseTypedSource(jsonSource))
+        typedSources.add(parseTypedSource(jsonSource, cmcdTransmissionMode))
       }
 
       // poster
@@ -166,16 +178,16 @@ class SourceAdapter {
   }
 
   @Throws(THEOplayerException::class)
-  private fun parseTypedSource(jsonTypedSource: JSONObject): TypedSource {
+  private fun parseTypedSource(jsonTypedSource: JSONObject, cmcdTransmissionMode: CMCDTransmissionMode? = null): TypedSource {
     // Some integrations do not support the Builder pattern
     return when (jsonTypedSource.optString(PROP_INTEGRATION)) {
       INTEGRATION_THEOLIVE -> parseTheoLiveSource(jsonTypedSource)
-      else -> parseTypedSourceFromBuilder(jsonTypedSource)
+      else -> parseTypedSourceFromBuilder(jsonTypedSource, cmcdTransmissionMode)
     }
   }
 
   @Throws(THEOplayerException::class)
-  private fun parseTypedSourceFromBuilder(jsonTypedSource: JSONObject): TypedSource {
+  private fun parseTypedSourceFromBuilder(jsonTypedSource: JSONObject, cmcdTransmissionMode: CMCDTransmissionMode? = null): TypedSource {
     try {
       var tsBuilder = TypedSource.Builder(jsonTypedSource.optString(PROP_SRC))
       val sourceType = parseSourceType(jsonTypedSource)
@@ -215,6 +227,9 @@ class SourceAdapter {
           tsBuilder.drm(drmConfig)
         }
       }
+      if (cmcdTransmissionMode != null) {
+        tsBuilder.cmcdTransmissionMode(cmcdTransmissionMode)
+      }
       return tsBuilder.build()
     } catch (e: THEOplayerException) {
       // Rethrow THEOplayerException
@@ -327,12 +342,13 @@ class SourceAdapter {
     }
     return TheoAdDescription(
       adTagParameters = parseAdTagParameters(jsonAdDescription.optJSONObject(PROP_AD_TAG_PARAMETERS)),
-      backdropDoubleBox = jsonAdDescription.optString(PROP_BACKDROP_DOUBLE_BOX),
-      backdropLShape = jsonAdDescription.optString(PROP_BACKDROP_LSHAPE),
-      customAssetKey = jsonAdDescription.optString(PROP_CUSTOM_ASSET_KEY),
-      networkCode = jsonAdDescription.optString(PROP_NETWORK_CODE),
+      backdropDoubleBox = jsonAdDescription.optString(PROP_BACKDROP_DOUBLE_BOX).takeIf { it.isNotEmpty() },
+      backdropLShape = jsonAdDescription.optString(PROP_BACKDROP_LSHAPE).takeIf { it.isNotEmpty() },
+      customAssetKey = jsonAdDescription.optString(PROP_CUSTOM_ASSET_KEY).takeIf { it.isNotEmpty() },
+      networkCode = jsonAdDescription.optString(PROP_NETWORK_CODE).takeIf { it.isNotEmpty() },
       overrideLayout = parseOverrideLayout(jsonAdDescription.optString(PROP_OVERRIDE_LAYOUT)),
-      useId3 = jsonAdDescription.optBoolean(PROP_USE_ID3),
+      useId3 = jsonAdDescription.optBoolean(PROP_USE_ID3, false),
+      retrievePodIdURI = jsonAdDescription.optString(PROP_RETRIEVE_POD_ID_URI).takeIf { it.isNotEmpty() },
     )
   }
 
@@ -429,4 +445,17 @@ class SourceAdapter {
 
     return BridgeUtils.fromJSONObjectToBridge(json)
   }
+
+  private fun parseCmcdTransmissionMode(cmcdConfiguration : JSONObject) : CMCDTransmissionMode {
+    try {
+      val transmissionMode = cmcdConfiguration.optInt(CMCD_TRANSMISSION_MODE)
+      if (transmissionMode === CmcdTransmissionMode.QUERY_ARGUMENT.ordinal) {
+        return CMCDTransmissionMode.QUERY_ARGUMENT
+      }
+      return CMCDTransmissionMode.HTTP_HEADER
+    } catch (e: JSONException) {
+      e.printStackTrace()
+      return CMCDTransmissionMode.HTTP_HEADER
+    }
+  }
 }

package/android/src/main/java/com/theoplayer/util/BridgeUtils.kt

@@ -8,9 +8,9 @@ import org.json.JSONException
 import org.json.JSONObject
 
 object BridgeUtils {
-  fun fromJSONObjectToMap(json: JSONObject): Map<String, String> {
+  fun fromJSONObjectToMap(json: JSONObject?): Map<String, String> {
     return mutableMapOf<String, String>().apply {
-      json.keys().forEach { key ->
+      json?.keys()?.forEach { key ->
         put(key, json.getString(key))
       }
     }

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -226,6 +226,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
     private func parsePipConfig(configDict: NSDictionary) -> PipConfig {
         var pipConfig = PipConfig()
         pipConfig.canStartPictureInPictureAutomaticallyFromInline = configDict["startsAutomatically"] as? Bool ?? false
+        pipConfig.retainPresentationModeOnSourceChange = configDict["retainPipOnSourceChange"] as? Bool ?? false
         return pipConfig
     }
 

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -57,7 +57,9 @@ let SD_PROP_BACKDROP_L_SHAPE: String = "backdropLShape"
 let SD_PROP_OVERRIDE_LAYOUT: String = "overrideLayout"
 let SD_PROP_OVERRIDE_AD_SRC: String = "overrideAdSrc"
 let SD_PROP_USE_ID3: String = "useId3"
+let SD_PROP_RETRIEVE_POD_ID_URI: String = "retrievePodIdURI"
 let SD_PROP_HLS_DATE_RANGE: String = "hlsDateRange"
+let SD_PROP_CMCD: String = "cmcd"
 
 let EXTENSION_HLS: String = ".m3u8"
 let EXTENSION_MP4: String = ".mp4"
@@ -156,8 +158,15 @@ class THEOplayerRCTSourceDescriptionBuilder {
         if let metadataData = sourceData[SD_PROP_METADATA] as? [String:Any] {
             metadataDescription = THEOplayerRCTSourceDescriptionBuilder.buildMetaDataDescription(metadataData)
         }
+      
+        // 6. configure CMCD
+        if let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any] {
+          typedSources.forEach { typedSource in
+            typedSource.cmcd = true;
+          }
+        }
 
-        // 6. construct the SourceDescription
+        // 7. construct the SourceDescription
         let sourceDescription = SourceDescription(sources: typedSources,
                                  textTracks: textTrackDescriptions,
                                  ads: adsDescriptions,