react-native-theoplayer 8.18.0 → 9.0.1

package/CHANGELOG.md

@@ -5,6 +5,36 @@ 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.0.1] - 25-04-08
+
+### Fixed
+
+- Fixed an issue on Android where an app would sometimes crash while receiving the license response when using a custom DRM integration.
+
+### Added
+
+- Added supported for multimedia tunneling on Android using the Media3 playback pipeline. More info on the [documentation](./doc/media3.md#multimedia-tunneling) page.
+
+## [9.0.0] - 25-04-04
+
+### Removed
+
+- Removed `chromeless` property from `PlayerConfiguration`. Only React Native based UIs are supported.
+- Removed ad integration kind `theo`.
+- Removed `enableTHEOlive` property from `PlayerConfiguration` as THEOlive is always enabled.
+
+### Added
+
+- Added `liveOffset` property to `SourceDescription` for Web and Android platforms.
+- Added `description` property for Google IMA ads on Web and Android platforms.
+- Added `networkCode` property for Google DAI configuration on Web platforms.
+- Added `segmentRelativeVttTiming` property on `DashPlaybackConfiguration` for Web to indicate whether segmented WebVTT files' timestamps should be considered relative to the segment start time.
+- Added `storageType` to `CachingTaskParameters` to allow writing to either the legacy cache or Media3 cache on Android.
+
+### Changed
+
+- Reverted DataRangeCue timings calculation on iOS (based on programDateTime offset). Correct values are provided by the native SDK.
+
 ## [8.18.0] - 25-04-02
 
 ### Changed

package/README.md

@@ -182,6 +182,7 @@ This section gives an overview of features, limitations and known issues:
 - [Digital Rights Management (DRM)](./doc/drm.md)
 - [Fullscreen presentation](./doc/fullscreen.md)
 - [Media Caching](./doc/media-caching.md)
+- [Migrating to THEOplayer 9.x🔥](./doc/migrating-to-react-native-theoplayer-9.md)
 - [Picture-in-Picture (PiP)](./doc/pip.md)
 - [Subtitles, Closed Captions and Metadata tracks](./doc/texttracks.md)
 - [Limitations and known issues](./doc/limitations.md)

package/android/build.gradle

@@ -40,7 +40,6 @@ def enabledTHEOads = safeExtGet("THEOplayer_extensionTHEOads", 'false').toBoolea
 def enabledAds = enabledGoogleIMA || enabledGoogleDAI || enabledTHEOads
 def enabledCast = safeExtGet("THEOplayer_extensionCast", 'false').toBoolean()
 def enabledMediaSession = safeExtGet("THEOplayer_extensionMediaSession", 'true').toBoolean()
-def enabledMedia3 = safeExtGet("THEOplayer_extensionMedia3", 'false').toBoolean()
 
 android {
   compileSdk safeExtGet('THEOplayer_compileSdkVersion', 34)
@@ -76,7 +75,6 @@ android {
     buildConfigField "boolean", "EXTENSION_ADS", "${enabledAds}"
     buildConfigField "boolean", "EXTENSION_CAST", "${enabledCast}"
     buildConfigField "boolean", "EXTENSION_MEDIASESSION", "${enabledMediaSession}"
-    buildConfigField "boolean", "EXTENSION_MEDIA3", "${enabledMedia3}"
 
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
@@ -125,70 +123,62 @@ repositories {
   maven { url "https://maven.theoplayer.com/releases" }
 }
 
-// The minimum supported THEOplayer version is 8.5.1
-def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[8.5.1, 9.0.0)')
-def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[8.0.0, 9.0.0)')
+// The minimum supported THEOplayer version is 9.0.0
+def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[9.0.0, 10.0.0)')
+def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[8.0.0, 10.0.0)')
+def theoplayer_ads_wrapper_version = "9.0.0"
 
 dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"  // From node_modules
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${safeExtGet('coroutinesVersion', '1.7.3')}"
   implementation "androidx.appcompat:appcompat:${safeExtGet('appcompatVersion', '1.6.1')}"
-  implementation "androidx.core:core-ktx:${safeExtGet('corektxVersion', '1.10.1')}"
+  implementation "androidx.core:core-ktx:${safeExtGet('corektxVersion', '1.13.1')}"
   implementation "com.google.code.gson:gson:2.11.0"
 
   println("Using THEOplayer (${versionString(theoplayer_sdk_version)})")
-  implementation "com.theoplayer.theoplayer-sdk-android:core:${theoplayer_sdk_version}"
-  implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:8.0.0"
-  implementation "com.theoplayer.android-connector:mediasession:${theoplayer_mediasession_version}"
+  implementation "com.theoplayer.theoplayer-sdk-android:core:$theoplayer_sdk_version"
+  implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:$theoplayer_ads_wrapper_version"
+  implementation "com.theoplayer.android-connector:mediasession:$theoplayer_mediasession_version"
 
   if (enabledGoogleIMA) {
     println('Enable THEOplayer IMA extension.')
-    implementation "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:${theoplayer_sdk_version}"
+    implementation "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:$theoplayer_sdk_version"
   } else {
     println('Disable THEOplayer IMA extension.')
-    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:${theoplayer_sdk_version}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:$theoplayer_sdk_version"
   }
 
   if (enabledGoogleDAI) {
     println('Enable THEOplayer DAI extension.')
-    implementation "com.theoplayer.theoplayer-sdk-android:integration-ads-dai:${theoplayer_sdk_version}"
+    implementation "com.theoplayer.theoplayer-sdk-android:integration-ads-dai:$theoplayer_sdk_version"
   } else {
     println('Disable THEOplayer DAI extension.')
-    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads-dai:${theoplayer_sdk_version}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads-dai:$theoplayer_sdk_version"
   }
 
   if (enabledTHEOads) {
     println('Enable THEOplayer THEOads extension.')
-    implementation "com.theoplayer.theoplayer-sdk-android:integration-ads-theoads:${theoplayer_sdk_version}"
+    implementation "com.theoplayer.theoplayer-sdk-android:integration-ads-theoads:$theoplayer_sdk_version"
   } else {
     println('Disable THEOplayer THEOads extension.')
-    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads-theoads:${theoplayer_sdk_version}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-ads-theoads:$theoplayer_sdk_version"
   }
 
   if (enabledCast) {
     println('Enable THEOplayer cast extension.')
-    implementation "com.theoplayer.theoplayer-sdk-android:integration-cast:${theoplayer_sdk_version}"
+    implementation "com.theoplayer.theoplayer-sdk-android:integration-cast:$theoplayer_sdk_version"
   } else {
     println('Disable THEOplayer cast extension.')
-    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-cast:${theoplayer_sdk_version}"
-  }
-
-  if (enabledMedia3) {
-    println('Enable THEOplayer media3 extension.')
-    implementation "com.theoplayer.theoplayer-sdk-android:integration-media3:${theoplayer_sdk_version}"
-  } else {
-    println('Disable THEOplayer media3 extension.')
-    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-media3:${theoplayer_sdk_version}"
+    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-cast:$theoplayer_sdk_version"
   }
 }
 
 // Make sure to align all ads extension versions
 configurations.configureEach {
   resolutionStrategy {
-    force "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:${theoplayer_sdk_version}"
-    force "com.theoplayer.theoplayer-sdk-android:integration-ads-dai:${theoplayer_sdk_version}"
-    force "com.theoplayer.theoplayer-sdk-android:integration-ads-theoads:${theoplayer_sdk_version}"
+    force "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:$theoplayer_sdk_version"
+    force "com.theoplayer.theoplayer-sdk-android:integration-ads-dai:$theoplayer_sdk_version"
+    force "com.theoplayer.theoplayer-sdk-android:integration-ads-theoads:$theoplayer_sdk_version"
   }
 }
-

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/{8.0.0/ads-wrapper-8.0.0.pom → 9.0.0/ads-wrapper-9.0.0.pom}

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>8.0.0</modelVersion>
+  <modelVersion>9.0.0</modelVersion>
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
-  <version>8.0.0</version>
+  <version>9.0.0</version>
   <packaging>aar</packaging>
   <dependencies>
     <!-- Include transitive dependencies -->
     <dependency>
       <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
       <artifactId>integration-ads-ima</artifactId>
-      <version>[8.0.0,)</version>
+      <version>[9.0.0,10.0.0)</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/maven-metadata-local.xml

@@ -3,11 +3,11 @@
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
   <versioning>
-    <latest>8.0.0</latest>
-    <release>8.0.0</release>
+    <latest>9.0.0</latest>
+    <release>9.0.0</release>
     <versions>
-      <version>8.0.0</version>
+      <version>9.0.0</version>
     </versions>
-    <lastUpdated>20240909163212</lastUpdated>
+    <lastUpdated>20250327163212</lastUpdated>
   </versioning>
 </metadata>

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

@@ -17,12 +17,9 @@ import com.theoplayer.media.MediaSessionConfigAdapter
 private const val PROP_LICENSE = "license"
 private const val PROP_LICENSE_URL = "licenseUrl"
 private const val PROP_PRELOAD = "preload"
-private const val PROP_LIVE_OFFSET = "liveOffset"
 private const val PROP_UI_ENABLED = "uiEnabled"
 private const val PROP_CAST_STRATEGY = "strategy"
 private const val PROP_RETRY_CONFIG = "retryConfiguration"
-private const val PROP_HLS_DATE_RANGE = "hlsDateRange"
-private const val PROP_USE_MEDIA3 = "useMedia3"
 private const val PROP_RETRY_MAX_RETRIES = "maxRetries"
 private const val PROP_RETRY_MIN_BACKOFF = "minimumBackoff"
 private const val PROP_RETRY_MAX_BACKOFF = "maximumBackoff"
@@ -42,15 +39,10 @@ private const val PROP_ALLOWED_MIMETYPES = "allowedMimeTypes"
 private const val PROP_THEOLIVE_CONFIG = "theoLive"
 private const val PROP_THEOLIVE_EXTERNAL_SESSION_ID = "externalSessionId"
 private const val PROP_THEOLIVE_ANALYTICS_DISABLED = "analyticsDisabled"
+private const val PROP_MULTIMEDIA_TUNNELING_ENABLED = "tunnelingEnabled"
 
 class PlayerConfigAdapter(private val configProps: ReadableMap?) {
 
-  /**
-   * Whether the Media3 extension is used for play-out.
-   */
-  var useMedia3: Boolean = false
-    private set
-
   /**
    * Get general THEOplayerConfig object; these properties apply:
    * - license: The license for the player.
@@ -69,19 +61,15 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
         if (hasKey(PROP_RETRY_CONFIG)) {
           networkConfiguration(networkConfig())
         }
-        if (hasKey(PROP_LIVE_OFFSET)) {
-          liveOffset(getDouble(PROP_LIVE_OFFSET))
-        }
-        if (hasKey(PROP_HLS_DATE_RANGE)) {
-          hlsDateRange(getBoolean(PROP_HLS_DATE_RANGE))
-        }
-        if (hasKey(PROP_USE_MEDIA3)) {
-          useMedia3 = getBoolean(PROP_USE_MEDIA3)
-        }
         if (hasKey(PROP_THEOLIVE_CONFIG)) {
           theoLiveConfiguration(theoLiveConfig())
         }
         pipConfiguration(PipConfiguration.Builder().build())
+        // Opt-out for auto-integrations for now
+        autoIntegrations(false)
+        if (hasKey(PROP_MULTIMEDIA_TUNNELING_ENABLED)) {
+          tunnelingEnabled(getBoolean(PROP_MULTIMEDIA_TUNNELING_ENABLED))
+        }
       }
     }.build()
   }

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

@@ -17,6 +17,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.theoplayer.android.api.THEOplayerView
 import com.theoplayer.android.api.ads.dai.GoogleDaiIntegration
 import com.theoplayer.android.api.ads.dai.GoogleDaiIntegrationFactory
+import com.theoplayer.android.api.ads.ima.GoogleImaConfiguration
 import com.theoplayer.android.api.ads.ima.GoogleImaIntegration
 import com.theoplayer.android.api.ads.ima.GoogleImaIntegrationFactory
 import com.theoplayer.android.api.ads.theoads.TheoAdDescription
@@ -26,8 +27,6 @@ import com.theoplayer.android.api.cast.CastIntegration
 import com.theoplayer.android.api.cast.CastIntegrationFactory
 import com.theoplayer.android.api.event.EventListener
 import com.theoplayer.android.api.event.player.*
-import com.theoplayer.android.api.media3.Media3PlayerIntegration
-import com.theoplayer.android.api.media3.Media3PlayerIntegrationFactory
 import com.theoplayer.android.api.player.Player
 import com.theoplayer.android.api.player.RenderingTarget
 import com.theoplayer.android.connector.mediasession.MediaSessionConnector
@@ -90,7 +89,6 @@ class ReactTHEOplayerContext private constructor(
   private var theoAdsIntegration: TheoAdsIntegration? = null
   var castIntegration: CastIntegration? = null
   @Suppress("UnstableApiUsage")
-  private var media3Integration: Media3PlayerIntegration? = null
   var wasPlayingOnHostPause: Boolean = false
   private var isHostPaused: Boolean = false
 
@@ -290,7 +288,7 @@ class ReactTHEOplayerContext private constructor(
     try {
       if (BuildConfig.EXTENSION_GOOGLE_IMA) {
         imaIntegration = GoogleImaIntegrationFactory.createGoogleImaIntegration(
-          playerView, configAdapter.imaSdkSettings()
+          playerView, GoogleImaConfiguration(configAdapter.imaSdkSettings())
         ).apply {
           setAdsRenderingSettings(configAdapter.adsRenderSettings())
         }.also {
@@ -303,7 +301,7 @@ class ReactTHEOplayerContext private constructor(
     try {
       if (BuildConfig.EXTENSION_GOOGLE_DAI) {
         daiIntegration = GoogleDaiIntegrationFactory.createGoogleDaiIntegration(
-          playerView, configAdapter.imaSdkSettings()
+          playerView, GoogleImaConfiguration(configAdapter.imaSdkSettings())
         ).apply {
           setAdsRenderingSettings(configAdapter.adsRenderSettings())
         }.also {
@@ -335,26 +333,6 @@ class ReactTHEOplayerContext private constructor(
     } catch (e: Exception) {
       Log.w(TAG, "Failed to configure Cast integration ${e.message}")
     }
-    try {
-      if (BuildConfig.EXTENSION_MEDIA3) {
-        @Suppress("UnstableApiUsage")
-        media3Integration =
-          Media3PlayerIntegrationFactory.createMedia3PlayerIntegration { _, source ->
-            // selectedSource -> represents the TypedSource the player picked to play.
-            // source -> represents the SourceDescription passed to the player.
-            // return true -> the Media3 integration pipeline will be used to play the selected source.
-            // 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 ||
-              (BuildConfig.EXTENSION_THEOADS && source.ads.any { it is TheoAdDescription })
-          }
-        playerView.player.addIntegration(media3Integration)
-      }
-    } catch (e: Exception) {
-      Log.w(TAG, "Failed to configure Cast integration ${e.message}")
-    }
-
     // Add other future integrations here.
   }
 

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

@@ -1,12 +1,9 @@
-@file:Suppress("unused")
-
 package com.theoplayer
 
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.common.MapBuilder
 
 private const val REACT_CLASS = "THEOplayerRCTView"
 
@@ -35,10 +32,6 @@ class ReactTHEOplayerViewManager : ViewGroupManager<ReactTHEOplayerView>() {
   }
 
   override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> {
-    val builder = MapBuilder.builder<String, Any>()
-    for (event in PlayerEventEmitter.Events) {
-      builder.put(event, MapBuilder.of("registrationName", event))
-    }
-    return builder.build()
+    return PlayerEventEmitter.Events.associateWith { mapOf("registrationName" to it) }
   }
 }

package/android/src/main/java/com/theoplayer/ads/AdAdapter.kt

@@ -9,7 +9,7 @@ import com.google.ads.interactivemedia.v3.api.UiElement
 import com.theoplayer.android.api.ads.Ad
 import com.theoplayer.android.api.ads.AdBreak
 import com.theoplayer.android.api.ads.CompanionAd
-import com.theoplayer.android.api.ads.GoogleImaAd
+import com.theoplayer.android.api.ads.ima.GoogleImaAd
 import com.theoplayer.android.api.ads.UniversalAdId
 import com.theoplayer.android.api.event.ads.AdIntegrationKind
 import java.lang.Exception
@@ -23,6 +23,7 @@ private const val PROP_AD_BREAK = "adBreak"
 private const val PROP_AD_COMPANIONS = "companions"
 private const val PROP_AD_SKIPOFFSET = "skipOffset"
 private const val PROP_AD_CREATIVE_ID = "creativeId"
+private const val PROP_AD_DESCRIPTION = "description"
 private const val PROP_AD_TRAFFICKING_PARAMETERS = "traffickingParametersString"
 private const val PROP_AD_BITRATE = "bitrate"
 private const val PROP_AD_UNIVERSAL_AD_IDS = "universalAdIds"
@@ -95,6 +96,7 @@ object AdAdapter {
         adPayload.putDouble(PROP_AD_WIDTH, ad.imaAd.vastMediaWidth.toDouble())
         adPayload.putDouble(PROP_AD_HEIGHT, ad.imaAd.vastMediaHeight.toDouble())
         adPayload.putString(PROP_AD_CONTENT_TYPE, ad.imaAd.contentType)
+        adPayload.putString(PROP_AD_DESCRIPTION, ad.imaAd.description)
       } catch (ignore: Exception) {
         // googleImaAd.getImaAd() is not known yet
       }
@@ -103,9 +105,9 @@ object AdAdapter {
         val idPayload = Arguments.createMap()
         idPayload.putString(
           PROP_UNIVERSAL_AD_ID_REGISTRY,
-          universalAdId.universalAdIdRegistry
+          universalAdId?.universalAdIdRegistry
         )
-        idPayload.putString(PROP_UNIVERSAL_AD_ID_VALUE, universalAdId.universalAdIdValue)
+        idPayload.putString(PROP_UNIVERSAL_AD_ID_VALUE, universalAdId?.universalAdIdValue)
         universalAdIdsPayload.pushMap(idPayload)
       }
       adPayload.putArray(PROP_AD_UNIVERSAL_AD_IDS, universalAdIdsPayload)
@@ -215,41 +217,32 @@ object AdAdapter {
         return null
       }
 
-      override fun getImaAd(): com.google.ads.interactivemedia.v3.api.Ad {
-        return parseImaAd(ad)
-      }
+      override val imaAd: com.google.ads.interactivemedia.v3.api.Ad
+        get() = parseImaAd(ad)
 
-      override fun getAdSystem(): String {
-        return ad.getString(PROP_AD_SYSTEM) ?: ""
-      }
+      override val adSystem: String?
+        get() = ad.getString(PROP_AD_SYSTEM)
 
-      override fun getCreativeId(): String? {
-        return ad.getString(PROP_AD_CREATIVE_ID)
-      }
+      override val creativeId: String?
+        get() = ad.getString(PROP_AD_CREATIVE_ID)
 
-      override fun getWrapperAdIds(): List<String> {
-        return emptyList()
-      }
+      override val wrapperAdIds: List<String?>
+        get() = emptyList()
 
-      override fun getWrapperAdSystems(): List<String> {
-        return emptyList()
-      }
+      override val wrapperAdSystems: List<String?>
+        get() = emptyList()
 
-      override fun getWrapperCreativeIds(): List<String> {
-        return emptyList()
-      }
+      override val wrapperCreativeIds: List<String?>
+        get() = emptyList()
 
-      override fun getVastMediaBitrate(): Int {
-        return if (ad.hasKey(PROP_AD_BITRATE)) ad.getInt(PROP_AD_BITRATE) else 0
-      }
+      override val vastMediaBitrate: Int
+        get() = if (ad.hasKey(PROP_AD_BITRATE)) ad.getInt(PROP_AD_BITRATE) else 0
 
-      override fun getUniversalAdIds(): List<UniversalAdId> {
-        return emptyList()
-      }
+      override val universalAdIds: List<UniversalAdId?>
+        get() = emptyList()
 
-      override fun getTraffickingParameters(): String {
-        return ad.getString(PROP_AD_TRAFFICKING_PARAMETERS) ?: ""
-      }
+      override val traffickingParameters: String
+        get() = ad.getString(PROP_AD_TRAFFICKING_PARAMETERS) ?: ""
     }
   }
 
@@ -399,7 +392,7 @@ object AdAdapter {
       }
 
       override fun getDescription(): String {
-        return ""
+        return ad?.getString(PROP_AD_DESCRIPTION) ?: ""
       }
 
       override fun getSurveyUrl(): String {

package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt

@@ -7,7 +7,7 @@ import com.facebook.react.bridge.WritableMap
 import com.google.ads.interactivemedia.v3.api.AdError
 import com.theoplayer.android.api.ads.Ad
 import com.theoplayer.android.api.ads.AdBreak
-import com.theoplayer.android.api.ads.GoogleImaAd
+import com.theoplayer.android.api.ads.ima.GoogleImaAd
 import com.theoplayer.android.api.ads.ima.GoogleImaAdEvent
 import com.theoplayer.android.api.ads.ima.GoogleImaAdEventType
 import com.theoplayer.android.api.ads.wrapper.AdEventListener

package/android/src/main/java/com/theoplayer/cache/CacheAdapter.kt

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.theoplayer.android.api.cache.CacheStatus
+import com.theoplayer.android.api.cache.CacheStorageType
 import com.theoplayer.android.api.cache.CachingParameters
 import com.theoplayer.android.api.cache.CachingPreferredTrackSelection
 import com.theoplayer.android.api.cache.CachingTask
@@ -26,6 +27,7 @@ private const val PROP_PARAMETERS_BANDWIDTH = "bandwidth"
 private const val PROP_PARAMETERS_PREFERRED_TRACK_SELECTION = "preferredTrackSelection"
 private const val PROP_PARAMETERS_AUDIO_TRACK_SELECTION = "audioTrackSelection"
 private const val PROP_PARAMETERS_TEXT_TRACK_SELECTION = "textTrackSelection"
+private const val PROP_PARAMETERS_STORAGE_TYPE = "storageType"
 private const val PROP_DURATION = "duration"
 private const val PROP_CACHED = "cached"
 private const val PROP_SECONDS_CACHED = "secondsCached"
@@ -101,6 +103,12 @@ object CacheAdapter {
       if (parameters.hasKey(PROP_PARAMETERS_PREFERRED_TRACK_SELECTION)) {
         preferredTrackSelection(parsePreferredTrackSelection(parameters.getMap(PROP_PARAMETERS_PREFERRED_TRACK_SELECTION)))
       }
+      if (parameters.hasKey(PROP_PARAMETERS_STORAGE_TYPE)) {
+        storageType(when (parameters.getString(PROP_PARAMETERS_STORAGE_TYPE)) {
+          "legacy" -> CacheStorageType.LEGACY
+          else -> CacheStorageType.MEDIA3
+        })
+      }
     }.build()
   }
 
@@ -121,6 +129,10 @@ object CacheAdapter {
         putString(PROP_PARAMETERS_AMOUNT, parameters.amount)
         putDouble(PROP_PARAMETERS_BANDWIDTH, parameters.bandwidth.toDouble())
         putDouble(PROP_PARAMETERS_EXPIRATION_DATE, parameters.expirationDate.time.toDouble())
+        putString(PROP_PARAMETERS_STORAGE_TYPE, when (parameters.storageType) {
+          CacheStorageType.LEGACY -> "legacy"
+          CacheStorageType.MEDIA3 -> "media3"
+        })
       }
     }
   }

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

@@ -163,7 +163,9 @@ object ContentProtectionAdapter {
     payload.putString(PROP_STATUS_TEXT, response.statusText)
     val headers = Arguments.createMap()
     response.headers.entries.forEach { entry ->
-      headers.putString(entry.key, entry.value)
+      entry.key?.let { key ->
+        headers.putString(key, entry.value)
+      }
     }
     payload.putMap(PROP_HEADERS, headers)
     payload.putMap(PROP_REQUEST, fromRequest(integrationId, keySystemId, response.request))

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

@@ -237,7 +237,7 @@ class ContentProtectionModule(private val context: ReactApplicationContext) :
       Log.d(TAG, "emit $eventName ($requestId)")
     }
     payload.putString(PROP_REQUEST_ID, requestId)
-    val onTimeout = {
+    val onTimeout = Runnable {
       onError(
         THEOplayerException(ErrorCode.CONTENT_PROTECTION_ERROR, "$eventName time-out.")
       )

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

@@ -22,6 +22,7 @@ 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.PlaybackPipeline
 import com.theoplayer.android.api.source.dash.DashPlaybackConfiguration
 import com.theoplayer.android.api.theolive.TheoLiveSource
 import com.theoplayer.cmcd.CmcdTransmissionMode
@@ -66,7 +67,9 @@ 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_SSE_ENDPOINT = "sseEndpoint"
 private const val PROP_LATENCY_CONFIGURATION = "latencyConfiguration"
+private const val PROP_PLAYBACK_PIPELINE = "playbackPipeline"
 
 private const val ERROR_IMA_NOT_ENABLED = "Google IMA support not enabled."
 private const val ERROR_THEOADS_NOT_ENABLED = "THEOads support not enabled."
@@ -76,6 +79,7 @@ private const val ERROR_MISSING_CSAI_INTEGRATION = "Missing CSAI integration"
 private const val PROP_SSAI_INTEGRATION_GOOGLE_DAI = "google-dai"
 
 private const val INTEGRATION_THEOLIVE = "theolive"
+private const val PLAYBACK_PIPELINE_LEGACY = "legacy"
 
 private const val PROP_CMCD = "cmcd"
 private const val CMCD_TRANSMISSION_MODE = "transmissionMode"
@@ -227,6 +231,12 @@ class SourceAdapter {
           tsBuilder.drm(drmConfig)
         }
       }
+      if (jsonTypedSource.has(PROP_PLAYBACK_PIPELINE)) {
+        tsBuilder.playbackPipeline(when(jsonTypedSource.getString(PROP_PLAYBACK_PIPELINE)) {
+          PLAYBACK_PIPELINE_LEGACY -> PlaybackPipeline.LEGACY
+          else -> PlaybackPipeline.MEDIA3
+        })
+      }
       if (cmcdTransmissionMode != null) {
         tsBuilder.cmcdTransmissionMode(cmcdTransmissionMode)
       }
@@ -349,6 +359,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() },
+      sseEndpoint = jsonAdDescription.optString(PROP_SSE_ENDPOINT).takeIf { it.isNotEmpty() },
     )
   }
 

package/android/src/main/java/com/theoplayer/track/TrackListAdapter.kt

@@ -113,7 +113,7 @@ object TrackListAdapter {
         cuePayload.putDouble(PROP_PLANNED_DURATION, TypeUtils.encodeInfNan(1e3 * this))
       }
       cuePayload.putBoolean(PROP_END_ON_NEXT, cue.isEndOnNext)
-      cue.customAttributes?.asMap()?.run {
+      cue.customAttributes.asMap()?.run {
         val attributes = Arguments.createMap()
         forEach { (key, value) ->
           when (value) {

package/ios/THEOplayerRCTTrackMetadataAggregator.swift

@@ -105,17 +105,8 @@ class THEOplayerRCTTrackMetadataAggregator {
         var entry: [String:Any] = [:]
         entry[PROP_ID] = textTrackCue.id
         entry[PROP_UID] = textTrackCue.uid
-        var startTime = textTrackCue.startTime
-        var endTime = textTrackCue.endTime
-        if let dateRangeCue = textTrackCue as? DateRangeCue,
-           let programDateTime = player.currentProgramDateTime?.timeIntervalSince1970 {
-            let currentTime = player.currentTime
-            let offset = programDateTime - currentTime
-            startTime = dateRangeCue.startDate.timeIntervalSince1970 - offset
-            endTime = dateRangeCue.endDate != nil ? dateRangeCue.endDate!.timeIntervalSince1970 - offset : .infinity
-        }
-        entry[PROP_STARTTIME] = THEOplayerRCTTypeUtils.encodeInfNan((startTime ?? 0) * 1000)
-        entry[PROP_ENDTIME] = THEOplayerRCTTypeUtils.encodeInfNan((endTime ?? 0) * 1000)
+        entry[PROP_STARTTIME] = THEOplayerRCTTypeUtils.encodeInfNan(textTrackCue.startTime * 1000)
+        entry[PROP_ENDTIME] = THEOplayerRCTTypeUtils.encodeInfNan(textTrackCue.endTime * 1000)
         if let content = textTrackCue.content {
             entry[PROP_CUE_CONTENT] = content
         } else if let contentString = textTrackCue.contentString {

package/lib/commonjs/api/cache/CachingTaskParameters.js

@@ -3,4 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.StorageType = void 0;
+/**
+ * The types of cache storage supported by THEOplayer.
+ *
+ * @remarks
+ * <br/> - Available only on Android.
+ */
+let StorageType = exports.StorageType = /*#__PURE__*/function (StorageType) {
+  StorageType["LEGACY"] = "legacy";
+  StorageType["MEDIA3"] = "media3";
+  return StorageType;
+}({});
+/**
+ * Describes the configuration of a caching task.
+ *
+ * @public
+ */
 //# sourceMappingURL=CachingTaskParameters.js.map

package/lib/commonjs/api/cache/CachingTaskParameters.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["api/cache/CachingTaskParameters.ts"],"mappings":"","ignoreList":[]}
+{"version":3,"names":["StorageType","exports"],"sourceRoot":"../../../../src","sources":["api/cache/CachingTaskParameters.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AALA,IAMYA,WAAW,GAAAC,OAAA,CAAAD,WAAA,0BAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAqBvB;AACA;AACA;AACA;AACA","ignoreList":[]}

package/lib/commonjs/api/source/SourceDescription.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SourceIntegrationId = void 0;
+exports.SourceIntegrationId = exports.PlaybackPipeline = void 0;
 /**
  * Represents a media resource.
  *
@@ -42,6 +42,17 @@ let SourceIntegrationId = exports.SourceIntegrationId = /*#__PURE__*/function (S
   SourceIntegrationId["THEO_LIVE"] = "theolive";
   return SourceIntegrationId;
 }({});
+/**
+ * The playback pipeline to use to play a stream.
+ *
+ * @remarks
+ * <br/> - Available on Android only.
+ */
+let PlaybackPipeline = exports.PlaybackPipeline = /*#__PURE__*/function (PlaybackPipeline) {
+  PlaybackPipeline["LEGACY"] = "legacy";
+  PlaybackPipeline["MEDIA3"] = "media3";
+  return PlaybackPipeline;
+}({});
 /**
  * Describes the configuration of a player's source.
  *