react-native-theoplayer 10.13.0 → 11.1.0

package/CHANGELOG.md

@@ -5,6 +5,40 @@ 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).
 
+## [11.1.0] - 26-05-27
+
+### Added
+
+- Added `useSystemCaptionStyle` flag to `PlayerConfiguration` on Android. When set to `true`, the player will apply the caption styles as configured in the system settings.
+- Added support on iOS for controlling the targetQualities on THEOlive streams.
+
+### Fixed
+
+- Fixed an issue where on iOS the contentProtection queryParameters were not converted to string values, resulting in missing parameters in the urls.
+
+## [11.0.0] - 26-04-16
+
+### Added
+
+- Added support for player SDK v11. More info on the [migration documentation](./doc/migrating-to-react-native-theoplayer-11.md) page.
+- Enabled core library desugaring for Android to support version 3.39.0 of the Google IMA SDK.
+- Added `TextTrack.captionChannel` to retrieve the CEA-608 channel and/or CEA-708 service numbers of closed caption text tracks.
+
+### Changed
+
+- Upgraded example app to React-Native v0.84.1.
+- Changed the minimum supported iOS/tvOS version to 15.0, dropping support for iOS/tvOS 13 and 14.
+
+### Fixed
+
+- Fixed an issue on Web where Google IMA could fail to initialize when used with `react-reverse-portal` due to the player container not being attached to the document yet.
+
+### Removed
+
+- Removed deprecated `ResizeEvent` in favor of `DimensionChangeEvent`.
+- Removed deprecated `player.theolive` property in favor of `player.theoLive`.
+- Removed deprecated `source.integration` property in favor of `source.type`.
+
 ## [10.13.0] - 26-03-27
 
 ### Fixed

package/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '8.12.3')}"
+        classpath "com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '8.13.0')}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '2.2.10')}"
     }
 }
@@ -92,12 +92,16 @@ android {
             minifyEnabled false
         }
     }
+    buildFeatures {
+        buildConfig true
+    }
     lint {
         disable 'GradleCompatible'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
     packagingOptions {
         exclude 'META-INF/kotlin-stdlib.kotlin_module'
@@ -122,15 +126,16 @@ repositories {
     mavenLocal()
 }
 
-// The minimum supported THEOplayer version is 10.12.0
-def theoVersion = safeExtGet('THEOplayer_sdk', '[10.12.0, 11.0.0)')
-def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[8.0.0, 11.0.0)')
-def theoAdsWrapperVersion = "10.12.0"
+// The minimum supported THEOplayer version is 11.0.0
+def theoVersion = safeExtGet('THEOplayer_sdk', '[11.0.0, 12.0.0)')
+def theoMediaSessionVersion = safeExtGet('THEOplayer_mediasession', '[11.0.0, 12.0.0)')
+def theoAdsWrapperVersion = "11.0.0"
 def coroutinesVersion = safeExtGet('coroutinesVersion', '1.10.2')
 def appcompatVersion = safeExtGet('appcompatVersion', '1.7.1')
-def corektxVersion = safeExtGet('corektxVersion', '1.16.0')
-def gsonVersion = safeExtGet('gsonVersion', '2.13.1')
+def corektxVersion = safeExtGet('corektxVersion', '1.17.0')
+def gsonVersion = safeExtGet('gsonVersion', '2.13.2')
 def activityktxVersion = safeExtGet('activityktxVersion', '1.10.1')
+def coreLibraryDesugaringVersion = safeExtGet('coreLibraryDesugaringVersion', '2.1.5')
 
 dependencies {
     def addOptiViewIntegration = { enabled, notation, additional = null ->
@@ -156,6 +161,7 @@ dependencies {
     implementation("androidx.core:core-ktx:$corektxVersion")
     implementation("androidx.activity:activity-ktx:$activityktxVersion")
     implementation("com.google.code.gson:gson:$gsonVersion")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:$coreLibraryDesugaringVersion")
 
     println("Using THEOplayer (${versionString(theoVersion)})")
     implementation("com.theoplayer.theoplayer-sdk-android:core:$theoVersion")

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/{10.12.0/ads-wrapper-10.12.0.pom → 11.0.0/ads-wrapper-11.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>10.12.0</modelVersion>
+  <modelVersion>11.0.0</modelVersion>
   <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
   <artifactId>ads-wrapper</artifactId>
-  <version>10.12.0</version>
+  <version>11.0.0</version>
   <packaging>aar</packaging>
   <dependencies>
     <!-- Include transitive dependencies -->
     <dependency>
       <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
       <artifactId>integration-ads-ima</artifactId>
-      <version>[10.0.0,11.0.0)</version>
+      <version>[11.0.0,12.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>10.12.0</latest>
-    <release>10.12.0</release>
+    <latest>11.0.0</latest>
+    <release>11.0.0</release>
     <versions>
-      <version>10.12.0</version>
+      <version>11.0.0</version>
     </versions>
-    <lastUpdated>20260318164412</lastUpdated>
+    <lastUpdated>20260410095400</lastUpdated>
   </versioning>
 </metadata>

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

@@ -44,6 +44,8 @@ private const val PROP_THEOLIVE_ANALYTICS_DISABLED = "analyticsDisabled"
 private const val PROP_THEOLIVE_DISCOVERY_URL = "discoveryUrl"
 private const val PROP_MULTIMEDIA_TUNNELING_ENABLED = "tunnelingEnabled"
 private const val PROP_DEBUG_LOGS_ENABLED = "debugLogsEnabled"
+private const val PROP_SYSTEM_CAPTION_STYLE = "useSystemCaptionStyle"
+
 
 class PlayerConfigAdapter(private val configProps: ReadableMap?) {
 
@@ -83,6 +85,9 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
         if (hasKey(PROP_MULTIMEDIA_TUNNELING_ENABLED)) {
           tunnelingEnabled(getBoolean(PROP_MULTIMEDIA_TUNNELING_ENABLED))
         }
+        if (hasKey(PROP_SYSTEM_CAPTION_STYLE)) {
+          useSystemCaptionStyle(getBoolean(PROP_SYSTEM_CAPTION_STYLE))
+        }
       }
     }.build()
   }
@@ -133,24 +138,24 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
           getMap(PROP_FEATURE_FLAGS)?.toHashMap()?.forEach { (key, value) ->
             convertedMap[key] = value as String
           }
-          featureFlags = convertedMap
+          setFeatureFlags(convertedMap)
         }
         // The maximum number of VAST redirects.
         if (hasKey(PROP_MAX_REDIRECTS)) {
           maxRedirects = getInt(PROP_MAX_REDIRECTS)
         }
         // The partner provided player type.
-        playerType = "THEOplayer"
+        setPlayerType("THEOplayer")
         // The partner provided player version.
-        playerVersion = THEOplayerGlobal.getVersion()
+        setPlayerVersion(THEOplayerGlobal.getVersion())
         // The Publisher Provided Identification (PPID) sent with ads request.
         if (hasKey(PROP_PPID)) {
-          ppid = getString(PROP_PPID) ?: ""
+          setPpid(getString(PROP_PPID) ?: "")
         }
         // The session ID to identify a single user session. This should be a UUID. It
         // is used exclusively for frequency capping across the user session.
         if (hasKey(PROP_SESSION_ID)) {
-          sessionId = getString(PROP_PPID) ?: ""
+          setSessionId(getString(PROP_PPID) ?: "")
         }
         // Toggles debug mode which will output detailed log information to the console.
         if (hasKey(PROP_ENABLE_DEBUG_MODE)) {
@@ -177,11 +182,11 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
           enablePreloading = preloadTypeString !== "none"
         }
         if (hasKey(PROP_ALLOWED_MIMETYPES)) {
-          mimeTypes = ArrayList<String>().apply {
+          setMimeTypes(ArrayList<String>().apply {
             getArray(PROP_ALLOWED_MIMETYPES)?.toArrayList()?.forEach {
               add(it as String)
             }
-          }
+          })
         }
       }
       // bitrate and timeout are configured under the ima config

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

@@ -100,7 +100,7 @@ object AdAdapter {
         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) {
+      } catch (_: Exception) {
         // googleImaAd.getImaAd() is not known yet
       }
       val universalAdIdsPayload = Arguments.createArray()
@@ -142,7 +142,7 @@ object AdAdapter {
       return adbreakPayload
     }
     adbreakPayload.putString(PROP_ADBREAK_INTEGRATION, adbreak.integration.type)
-    adbreakPayload.putString(PROP_ADBREAK_ID, adbreak.idAsString)
+    adbreakPayload.putString(PROP_ADBREAK_ID, adbreak.id)
     adbreakPayload.putInt(PROP_ADBREAK_MAXDURATION,adbreak.maxDuration)
     adbreakPayload.putInt(PROP_ADBREAK_TIMEOFFSET, adbreak.timeOffset)
     adbreakPayload.putDouble(PROP_ADBREAK_MAXREMAININGDURATION, adbreak.maxRemainingDuration)
@@ -288,10 +288,15 @@ object AdAdapter {
         return adBreak.getString(PROP_AD_CUSTOM_INTEGRATION)
       }
 
+      @Deprecated("Deprecated in favor of getIdAsString()")
       override fun getIdAsString(): String? {
         return if (adBreak.hasKey(PROP_ADBREAK_ID)) adBreak.getString(PROP_ADBREAK_ID) else null
       }
 
+      override fun getId(): String? {
+        return if (adBreak.hasKey(PROP_ADBREAK_ID)) adBreak.getString(PROP_ADBREAK_ID) else null
+      }
+
       override fun getCustomData(): Any? {
         // Not supported yet
         return null
@@ -415,16 +420,6 @@ object AdAdapter {
         return ad?.getString(PROP_AD_TRAFFICKING_PARAMETERS) ?: ""
       }
 
-      @Deprecated("Deprecated in Java")
-      override fun getUniversalAdIdRegistry(): String {
-        return ""
-      }
-
-      @Deprecated("Deprecated in Java")
-      override fun getUniversalAdIdValue(): String {
-        return ad?.getString(PROP_UNIVERSAL_AD_ID_VALUE) ?: ""
-      }
-
       override fun getCompanionAds(): List<com.google.ads.interactivemedia.v3.api.CompanionAd> {
         return emptyList()
       }

package/android/src/main/java/com/theoplayer/cast/CastModule.kt

@@ -59,7 +59,6 @@ class CastModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(
       PlayerCastState.AVAILABLE -> "available"
       PlayerCastState.CONNECTED -> "connected"
       PlayerCastState.CONNECTING -> "connecting"
-      PlayerCastState.UNAVAILABLE -> "unavailable"
       else -> "unavailable"
     }
   }

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

@@ -26,6 +26,7 @@ private const val PROP_NAME = "name"
 private const val PROP_ENABLED = "enabled"
 private const val PROP_SRC = "src"
 private const val PROP_FORCED = "forced"
+private const val PROP_CAPTION_CHANNEL = "captionChannel"
 private const val PROP_AUDIO_SAMPLING_RATE = "audioSamplingRate"
 private const val PROP_BANDWIDTH = "bandwidth"
 private const val PROP_QUALITIES = "qualities"
@@ -43,9 +44,6 @@ private const val PROP_ENDDATE = "endDate"
 private const val PROP_DURATION = "duration"
 private const val PROP_PLANNED_DURATION = "plannedDuration"
 private const val PROP_END_ON_NEXT = "endOnNext"
-private const val PROP_SCTE35CMD = "scte35Cmd"
-private const val PROP_SCTE35OUT = "scte35Out"
-private const val PROP_SCTE35IN = "scte35In"
 private const val PROP_CUSTOM_ATTRIBUTES = "customAttributes"
 
 object TrackListAdapter {
@@ -72,6 +70,9 @@ object TrackListAdapter {
     textTrackPayload.putString(PROP_SRC, textTrack.source)
     textTrackPayload.putBoolean(PROP_FORCED, textTrack.isForced)
 
+    // THEOplayer v10.13+
+    textTrack.captionChannel?.let { textTrackPayload.putInt(PROP_CAPTION_CHANNEL, it) }
+
     // Optionally pass cue list.
     val cueList = textTrack.cues
     if (cueList != null) {
@@ -167,13 +168,12 @@ object TrackListAdapter {
     audioTrackPayload.putString(PROP_LABEL, audioTrack.label)
     audioTrackPayload.putString(PROP_LANGUAGE, audioTrack.language)
     audioTrackPayload.putBoolean(PROP_ENABLED, audioTrack.isEnabled)
-    val qualityList = audioTrack.qualities
     val qualities = Arguments.createArray()
     try {
-      qualityList?.forEach { quality ->
+      audioTrack.qualities.forEach { quality ->
         qualities.pushMap(fromAudioQuality(quality))
       }
-    } catch (ignore: NullPointerException) {
+    } catch (_: NullPointerException) {
     }
     audioTrackPayload.putArray(PROP_QUALITIES, qualities)
     val activeQuality = audioTrack.activeQuality
@@ -214,18 +214,15 @@ object TrackListAdapter {
     videoTrackPayload.putBoolean(PROP_ENABLED, videoTrack.isEnabled)
     val qualities = Arguments.createArray()
     try {
-      val qualityList = videoTrack.qualities
-      if (qualityList != null) {
-        // Sort qualities according to (height, bandwidth)
-        val sortedQualityList = QualityListAdapter(qualityList)
-        sortedQualityList.sort { o: VideoQuality, t1: VideoQuality ->
-          if (o.height == t1.height) t1.bandwidth.compareTo(o.bandwidth) else t1.height.compareTo(o.height)
-        }
-        for (quality in sortedQualityList) {
-          qualities.pushMap(fromVideoQuality(quality as VideoQuality))
-        }
+      // Sort qualities according to (height, bandwidth)
+      val sortedQualityList = QualityListAdapter(videoTrack.qualities)
+      sortedQualityList.sort { o: VideoQuality, t1: VideoQuality ->
+        if (o.height == t1.height) t1.bandwidth.compareTo(o.bandwidth) else t1.height.compareTo(o.height)
+      }
+      for (quality in sortedQualityList) {
+        qualities.pushMap(fromVideoQuality(quality as VideoQuality))
       }
-    } catch (ignore: java.lang.NullPointerException) {
+    } catch (_: java.lang.NullPointerException) {
     }
     videoTrackPayload.putArray(PROP_QUALITIES, qualities)
     val activeQuality = videoTrack.activeQuality

package/ios/.editorconfig

@@ -0,0 +1,7 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+[*]
+indent_style = space
+indent_size = 4

package/ios/THEOplayerRCTBridge.m

@@ -113,7 +113,7 @@ RCT_EXTERN_METHOD(setSelectedVideoTrack:(nonnull NSNumber *)node
                   uid:(nonnull NSNumber *)uid)
 
 RCT_EXTERN_METHOD(setTargetVideoQuality:(nonnull NSNumber *)node
-                  uid:(nonnull NSNumber *)uid)
+                  uids:(nonnull NSArray<NSNumber *> *)uids)
 
 RCT_EXTERN_METHOD(setPreload:(nonnull NSNumber *)node
                   type:(nonnull NSString *)type)

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -10,8 +10,6 @@ import THEOplayerSDK
 import THEOplayerConnectorSideloadedSubtitle
 #endif
 
-let ERROR_MESSAGE_PLAYER_QUALITY_UNSUPPORTED_FEATURE: String = "Setting a target video quality is not supported on iOS/tvOS."
-
 let TTS_PROP_BACKGROUND_COLOR = "backgroundColor"
 let TTS_PROP_EDGE_STYLE = "edgeStyle"
 let TTS_PROP_FONT_COLOR = "fontColor"
@@ -337,10 +335,32 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
         }
     }
 
-    @objc(setTargetVideoQuality:uid:)
-    func setTargetVideoQuality(_ node: NSNumber, uid: [NSNumber]) -> Void {
-        if DEBUG_PLAYER_API { print(ERROR_MESSAGE_PLAYER_QUALITY_UNSUPPORTED_FEATURE) }
-        return
+    @objc(setTargetVideoQuality:uids:)
+    func setTargetVideoQuality(_ node: NSNumber, uids: [NSNumber]) -> Void {
+        DispatchQueue.main.async {
+            if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
+               let player = theView.player {
+                let videoTracks: VideoTrackList = player.videoTracks
+                guard videoTracks.count > 0 else {
+                    return
+                }
+                var activeVideoTrack: VideoTrack?
+                for i in 0...videoTracks.count-1 {
+                    let videoTrack: MediaTrack = videoTracks.get(i)
+                    if videoTrack.enabled {
+                        activeVideoTrack = videoTrack as? VideoTrack
+                    }
+                }
+                if let foundTrack = activeVideoTrack {
+                    let matchingQualities = (0..<foundTrack.qualities.count).compactMap { index in
+                        let quality = foundTrack.qualities.get(index)
+                        return uids.contains { $0.intValue == quality.bandwidth } ? quality : nil
+                    }
+                    foundTrack.targetQualities = matchingQualities
+                    if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack.") }
+                }
+            }
+        }
     }
 
     @objc(setPreload:type:)

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -357,7 +357,12 @@ class THEOplayerRCTSourceDescriptionBuilder {
             let licenseAcquisitionURL = fairplayData[SD_PROP_LICENSE_URL] as? String
             let headers = fairplayData[SD_PROP_HEADERS] as? [String:String]
             let licenseType = fairplayData[SD_PROP_LICENSE_TYPE] as? String
-            let queryParameters = fairplayData[SD_PROP_QUERY_PARAMETERS] as? [String:String]
+            var queryParameters: [String: String] = [:]
+            if let allQueryParams = fairplayData[SD_PROP_QUERY_PARAMETERS] as? [String:Any] {
+                for (key, value) in allQueryParams {
+                    queryParameters[key] = "\(value)"
+                }
+            }
                 
             fairplayKeySystem = KeySystemConfiguration(
                 licenseAcquisitionURL: licenseAcquisitionURL,
@@ -379,7 +384,12 @@ class THEOplayerRCTSourceDescriptionBuilder {
             let licenseAcquisitionURL = widevineData[SD_PROP_LICENSE_URL] as? String
             let headers = widevineData[SD_PROP_HEADERS] as? [String:String]
             let licenseType = widevineData[SD_PROP_LICENSE_TYPE] as? String
-            let queryParameters = widevineData[SD_PROP_QUERY_PARAMETERS] as? [String:String]
+            var queryParameters: [String: String] = [:]
+            if let allQueryParams = widevineData[SD_PROP_QUERY_PARAMETERS] as? [String:Any] {
+                for (key, value) in allQueryParams {
+                    queryParameters[key] = "\(value)"
+                }
+            }
                 
             widevineKeySystem = KeySystemConfiguration(
                 licenseAcquisitionURL: licenseAcquisitionURL,
@@ -391,7 +401,12 @@ class THEOplayerRCTSourceDescriptionBuilder {
         }
         
         // global query parameters
-        let queryParameters = contentProtectionData[SD_PROP_QUERY_PARAMETERS] as? [String:String]
+        var queryParameters: [String: String] = [:]
+        if let allQueryParams = contentProtectionData[SD_PROP_QUERY_PARAMETERS] as? [String:Any] {
+            for (key, value) in allQueryParams {
+                queryParameters[key] = "\(value)"
+            }
+        }
         let integrationParameters = contentProtectionData[SD_PROP_INTEGRATION_PARAMETERS] as? [String:Any] ?? [:]
         
         return MultiplatformDRMConfiguration(

package/ios/ads/THEOplayerRCTAdAdapter.swift

@@ -62,8 +62,8 @@ class THEOplayerRCTAdAdapter {
         if let skipOffset = ad.skipOffset {
             adData[PROP_AD_SKIP_OFFSET] = (skipOffset == -1) ? skipOffset : skipOffset
         }
-        if processAdBreak {
-           adData[PROP_AD_BREAK] = THEOplayerRCTAdAdapter.fromAdBreak(adBreak: ad.adBreak)
+        if processAdBreak, let adBreak = ad.adBreak {
+           adData[PROP_AD_BREAK] = THEOplayerRCTAdAdapter.fromAdBreak(adBreak: adBreak)
         }
         
 #if os(iOS)

package/ios/ads/THEOplayerRCTAdsNative.swift

@@ -5,7 +5,7 @@ import THEOplayerSDK
 
 class NativeAd: THEOplayerSDK.Ad {
     /** A reference to the `AdBreak` of which the ad is a part of.*/
-    var adBreak: AdBreak
+    var adBreak: AdBreak?
     /** An array of `CompanionAd`s associated to the ad, if available within the same Creatives element.*/
     var companions: [THEOplayerSDK.CompanionAd] = []
     /** Either 'linear' or 'nonlinear', depending on the concrete implementer.*/

package/ios/contentprotection/THEOplayerRCTContentProtectionAggregator.swift

@@ -17,6 +17,7 @@ let DRM_PROP_WIDEVINE: String = "widevine"
 let DRM_PROP_LICENSE_URL: String = "licenseAcquisitionURL"
 let DRM_PROP_CERTIFICATE_URL: String = "certificateURL"
 let DRM_PROP_BASE64_BODY: String = "base64body"
+let DRM_PROP_QUERY_PARAMETERS: String = "queryParameters"
 let DRM_PROP_FAIRPLAY_SKD_URL: String = "fairplaySkdUrl"
 let DRM_PROP_STATUS: String = "status"
 let DRM_PROP_STATUS_TEXT: String = "statusText"
@@ -32,6 +33,9 @@ class THEOplayerRCTContentProtectionAggregator {
         var aggregatedDrmConfig: [String:Any] = [:]
         aggregatedDrmConfig[DRM_PROP_INTEGRATION] = drmConfig.customIntegrationId ?? "unknown"
         aggregatedDrmConfig[DRM_PROP_INTEGRATION_PARAMS] = drmConfig.integrationParameters
+        if let queryParameters = drmConfig.queryParameters {
+            aggregatedDrmConfig[DRM_PROP_QUERY_PARAMETERS] = queryParameters
+        }
         if let multiDrmConfigCollection = drmConfig as? THEOplayerSDK.MultiplatformDRMConfiguration {
             let keySystemConfigurations: THEOplayerSDK.KeySystemConfigurationCollection = multiDrmConfigCollection.keySystemConfigurations
             if let fairplayConfig: THEOplayerSDK.KeySystemConfiguration = keySystemConfigurations.fairplay {
@@ -114,6 +118,12 @@ class THEOplayerRCTContentProtectionAggregator {
         if let certificateURL = keySystemConfig.certificateURL?.absoluteString {
             aggregatedKeySystem[DRM_PROP_CERTIFICATE_URL] = certificateURL
         }
+        if let headers = keySystemConfig.headers {
+            aggregatedKeySystem[DRM_PROP_HEADERS] = headers
+        }
+        if let queryParameters = keySystemConfig.queryParameters {
+            aggregatedKeySystem[DRM_PROP_QUERY_PARAMETERS] = queryParameters
+        }
         return aggregatedKeySystem
     }
 }

package/lib/commonjs/api/event/PlayerEvent.js

@@ -33,15 +33,6 @@ exports.PresentationModeChangePipContext = void 0;
  * @category Player
  * @public
  */
-/**
- * Dispatched when player is resized.
- *
- * @category Events
- * @category Player
- * @public
- *
- * @deprecated use {@link DimensionChangeEvent} instead. This event is set for removal in version 11.
- */
 /**
  * Dispatched when video is resized.
  *

package/lib/commonjs/api/event/PlayerEvent.js.map

@@ -1 +1 @@
-{"version":3,"names":["PresentationModeChangePipContext","exports"],"sourceRoot":"../../../../src","sources":["api/event/PlayerEvent.ts"],"mappings":";;;;;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AAWA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AANA,IAOYA,gCAAgC,GAAAC,OAAA,CAAAD,gCAAA,0BAAhCA,gCAAgC;EAAhCA,gCAAgC;EAAhCA,gCAAgC;EAAhCA,gCAAgC;EAAA,OAAhCA,gCAAgC;AAAA;AAmB5C;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AAkBA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAkBA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["PresentationModeChangePipContext","exports"],"sourceRoot":"../../../../src","sources":["api/event/PlayerEvent.ts"],"mappings":";;;;;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AAWA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AANA,IAOYA,gCAAgC,GAAAC,OAAA,CAAAD,gCAAA,0BAAhCA,gCAAgC;EAAhCA,gCAAgC;EAAhCA,gCAAgC;EAAhCA,gCAAgC;EAAA,OAAhCA,gCAAgC;AAAA;AAmB5C;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AAkBA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AAkBA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}

package/lib/commonjs/api/player/PlayerEventMap.js

@@ -43,7 +43,6 @@ let PlayerEventType = exports.PlayerEventType = /*#__PURE__*/function (PlayerEve
   PlayerEventType["WAITING"] = "waiting";
   PlayerEventType["PRESENTATIONMODE_CHANGE"] = "presentationmodechange";
   PlayerEventType["DESTROY"] = "destroy";
-  PlayerEventType["RESIZE"] = "resize";
   PlayerEventType["DIMENSION_CHANGE"] = "dimensionchange";
   PlayerEventType["VIDEO_RESIZE"] = "videoresize";
   return PlayerEventType;

package/lib/commonjs/api/player/PlayerEventMap.js.map

@@ -1 +1 @@
-{"version":3,"names":["PlayerEventType","exports"],"sourceRoot":"../../../../src","sources":["api/player/PlayerEventMap.ts"],"mappings":";;;;;;AAyBA;AACA;AACA;AACA;AACA;AACA;AACA;AANA,IAOYA,eAAe,GAAAC,OAAA,CAAAD,eAAA,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAwC3B;AACA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":["PlayerEventType","exports"],"sourceRoot":"../../../../src","sources":["api/player/PlayerEventMap.ts"],"mappings":";;;;;;AAwBA;AACA;AACA;AACA;AACA;AACA;AACA;AANA,IAOYA,eAAe,GAAAC,OAAA,CAAAD,eAAA,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAoC3B;AACA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}

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

@@ -3,84 +3,4 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SourceIntegrationId = void 0;
-/**
- * Represents a media resource.
- *
- * @remarks
- * <br/> - Can be a string value representing the URL of a media resource, a {@link TypedSource}.
- *
- * @category Source
- * @public
- */
-/**
- * A type alias for a {@link TypedSource} media resource.
- *
- * @category Source
- * @public
- */
-/**
- * A media resource or list of media resources.
- *
- * @remarks
- * <br/> - The order of sources when using a list determines their priority when attempting playback.
- *
- * @category Source
- * @public
- */
-/**
- * The cross-origin setting of a source, represented by a value from the following list:
- * <br/> - `'anonymous'`: CORS requests will have the credentials flag set to 'same-origin'.
- * <br/> - `'use-credentials'`: CORS requests will have the credentials flag set to 'include'.
- * <br/> - `''`: Setting the empty string is the same as `'anonymous'`
- *
- * @remarks
- * <br/> - See {@link https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes | The crossorigin attribute: Requesting CORS access to content}
- *
- * @category Source
- * @public
- */
-/**
- * The integration identifier of a source specific to a pre-integration, represented by a value from the following list:
- * <br/> - `'theolive'`: The source contains the THEOlive initialization url.
- *
- * @category Source
- * @public
- * @deprecated use {@link TypedSource.type} instead.
- */
-let SourceIntegrationId = exports.SourceIntegrationId = /*#__PURE__*/function (SourceIntegrationId) {
-  SourceIntegrationId["THEO_LIVE"] = "theolive";
-  return SourceIntegrationId;
-}({});
-/**
- * Describes the configuration of a player's source.
- *
- * @category Source
- * @public
- */
-/**
- * Describes the configuration of a player's source.
- *
- * @category Source
- * @public
- */
-/**
- * Describes the configuration of a side-loaded text track.
- *
- * @category Source
- * @category Media and Text Tracks
- * @public
- */
-/**
- * Represents the common properties of a media resource.
- *
- * @category Source
- * @public
- */
-/**
- * Represents a media resource characterized by a URL to the resource and optionally information about the resource.
- *
- * @category Source
- * @public
- */
 //# sourceMappingURL=SourceDescription.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["SourceIntegrationId","exports"],"sourceRoot":"../../../../src","sources":["api/source/SourceDescription.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAWA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAPA,IAQYA,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,0BAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAI/B;AACA;AACA;AACA;AACA;AACA;AAyDA;AACA;AACA;AACA;AACA;AACA;AAmDA;AACA;AACA;AACA;AACA;AACA;AACA;AA2FA;AACA;AACA;AACA;AACA;AACA;AAsFA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}
+{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["api/source/SourceDescription.ts"],"mappings":"","ignoreList":[]}

package/lib/commonjs/api/source/ads/Ads.js.map

@@ -1 +1 @@
-{"version":3,"names":["AdIntegrationKind","exports"],"sourceRoot":"../../../../../src","sources":["api/source/ads/Ads.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAeA;AACA;AACA;AACA;AACA;AACA;AACA;AAmDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAfA,IAgBYA,iBAAiB,GAAAC,OAAA,CAAAD,iBAAA,0BAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAA,OAAjBA,iBAAiB;AAAA","ignoreList":[]}
+{"version":3,"names":["AdIntegrationKind","exports"],"sourceRoot":"../../../../../src","sources":["api/source/ads/Ads.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AAeA;AACA;AACA;AACA;AACA;AACA;AACA;AAoDA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAfA,IAgBYA,iBAAiB,GAAAC,OAAA,CAAAD,iBAAA,0BAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAA,OAAjBA,iBAAiB;AAAA","ignoreList":[]}

package/lib/commonjs/api/track/TextTrack.js.map

@@ -1 +1 @@
-{"version":3,"names":["TextTrackType","exports","TextTrackKind","TextTrackMode","filterRenderableTracks","textTracks","filter","textTrack","kind","filterThumbnailTracks","find","isThumbnailTrack","label","hasTextTrackCue","cue","cues","c","uid","removeTextTrackCue","addTextTrackCue","push","findTextTrackByUid","t"],"sourceRoot":"../../../../src","sources":["api/track/TextTrack.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["TextTrackType","exports","TextTrackKind","TextTrackMode","filterRenderableTracks","textTracks","filter","textTrack","kind","filterThumbnailTracks","find","isThumbnailTrack","label","hasTextTrackCue","cue","cues","c","uid","removeTextTrackCue","addTextTrackCue","push","findTextTrackByUid","t"],"sourceRoot":"../../../../src","sources":["api/track/TextTrack.ts"],"mappings":"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","ignoreList":[]}