react-native-theoplayer 11.2.0 → 11.3.0

package/CHANGELOG.md

@@ -5,6 +5,26 @@ 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).
 
+## [Unreleased]
+
+## [11.3.0] - 26-06-18
+
+### Added
+
+- Added Android support for `ABRConfiguration.preferredMaximumResolution`, mirroring the existing iOS behaviour. Set to `(0,0)` to remove the cap.
+- Added basic support for CMCD event mode reporting of DRM and ad events.
+- Added bridging of the `hlsDateRange` property from `PlayerConfiguration` to Android's `THEOplayerConfig`.
+
+### Fixed
+
+- Fixed an issue on Android where `GoogleImaConfiguration.sessionId` was not properly passed.
+
+## [11.2.1] - 26-06-09
+
+### Fixed
+
+- Fixed an issue on iOS where setting the targetVideoQuality uids was causing a crash due to an unsafe bounds-check.
+
 ## [11.2.0] - 26-06-04
 
 ### Added

package/android/build.gradle

@@ -126,8 +126,8 @@ repositories {
     mavenLocal()
 }
 
-// The minimum supported THEOplayer version is 11.4.0
-def theoVersion = safeExtGet('THEOplayer_sdk', '[11.4.0, 12.0.0)')
+// The minimum supported THEOplayer version is 11.5.0
+def theoVersion = safeExtGet('THEOplayer_sdk', '[11.5.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')

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

@@ -8,6 +8,8 @@ import com.theoplayer.android.api.THEOplayerConfig
 import com.theoplayer.android.api.THEOplayerGlobal
 import com.theoplayer.android.api.cast.CastStrategy
 import com.theoplayer.android.api.cast.CastConfiguration
+import com.theoplayer.android.api.cmcd.CMCDConfiguration
+import com.theoplayer.android.api.cmcd.CMCDEndpointConfiguration
 import com.theoplayer.android.api.pip.PipConfiguration
 import com.theoplayer.android.api.player.NetworkConfiguration
 import com.theoplayer.android.api.theolive.THEOLiveConfig
@@ -42,9 +44,15 @@ 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_THEOLIVE_DISCOVERY_URL = "discoveryUrl"
+private const val PROP_HLS_DATERANGE = "hlsDateRange"
 private const val PROP_MULTIMEDIA_TUNNELING_ENABLED = "tunnelingEnabled"
 private const val PROP_DEBUG_LOGS_ENABLED = "debugLogsEnabled"
 private const val PROP_SYSTEM_CAPTION_STYLE = "useSystemCaptionStyle"
+private const val PROP_CMCD = "cmcd"
+private const val PROP_CMCD_EXTERNAL_SESSION_ID = "externalSessionId"
+private const val PROP_CMCD_USER_ID = "userId"
+private const val PROP_CMCD_EVENT_ENDPOINTS = "eventEndpoints"
+private const val PROP_CMCD_ENDPOINT_URL = "url"
 
 
 class PlayerConfigAdapter(private val configProps: ReadableMap?) {
@@ -82,12 +90,18 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
         pip(PipConfiguration.Builder().build())
         // Opt-out for auto-integrations for now
         autoIntegrations(false)
+        if (hasKey(PROP_HLS_DATERANGE)) {
+          hlsDateRange(getBoolean(PROP_HLS_DATERANGE))
+        }
         if (hasKey(PROP_MULTIMEDIA_TUNNELING_ENABLED)) {
           tunnelingEnabled(getBoolean(PROP_MULTIMEDIA_TUNNELING_ENABLED))
         }
         if (hasKey(PROP_SYSTEM_CAPTION_STYLE)) {
           useSystemCaptionStyle(getBoolean(PROP_SYSTEM_CAPTION_STYLE))
         }
+        if (hasKey(PROP_CMCD)) {
+          cmcd(cmcdConfig())
+        }
       }
     }.build()
   }
@@ -241,6 +255,22 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
     return MediaSessionConfigAdapter.fromProps(configProps?.getMap(PROP_MEDIA_CONTROL))
   }
 
+  private fun cmcdConfig(): CMCDConfiguration {
+    val config = configProps?.getMap(PROP_CMCD)
+    val endpoints = config?.getArray(PROP_CMCD_EVENT_ENDPOINTS)?.let { arr ->
+      (0 until arr.size()).mapNotNull { i ->
+        arr.getMap(i)?.getString(PROP_CMCD_ENDPOINT_URL)?.let { url ->
+          CMCDEndpointConfiguration(url = url)
+        }
+      }
+    }
+    return CMCDConfiguration(
+      externalSessionId = config?.getString(PROP_CMCD_EXTERNAL_SESSION_ID),
+      userId = config?.getString(PROP_CMCD_USER_ID),
+      eventEndpoints = endpoints
+    )
+  }
+
   private fun theoLiveConfig (): THEOLiveConfig {
     val config = configProps?.getMap(PROP_THEOLIVE_CONFIG)
     return THEOLiveConfig.Builder(

package/android/src/main/java/com/theoplayer/abr/ABRConfigurationAdapter.kt

@@ -1,5 +1,6 @@
 package com.theoplayer.abr
 
+import android.util.Size
 import com.facebook.react.bridge.ReadableMap
 import com.theoplayer.android.api.abr.AbrStrategyConfiguration
 import com.theoplayer.android.api.abr.AbrStrategyMetadata
@@ -12,6 +13,9 @@ object ABRConfigurationAdapter {
   private const val PROP_METADATA = "metadata"
   private const val PROP_TYPE = "type"
   private const val PROP_BITRATE = "bitrate"
+  private const val PROP_PREFERRED_MAXIMUM_RESOLUTION = "preferredMaximumResolution"
+  private const val PROP_WIDTH = "width"
+  private const val PROP_HEIGHT = "height"
 
   fun applyABRConfigurationFromProps(player: Player?, abrProps: ReadableMap?) {
     if (abrProps == null || player == null) {
@@ -20,6 +24,11 @@ object ABRConfigurationAdapter {
     if (abrProps.hasKey(PROP_TARGET_BUFFER)) {
       player.abr.targetBuffer = abrProps.getInt(PROP_TARGET_BUFFER)
     }
+    // (0,0) is the documented sentinel for "no cap" and maps to a null Size on the native SDK.
+    val preferredMaximumResolutionProps = abrProps.getMap(PROP_PREFERRED_MAXIMUM_RESOLUTION)
+    if (preferredMaximumResolutionProps != null) {
+      player.abr.preferredMaximumResolution = preferredMaximumResolutionFromProps(preferredMaximumResolutionProps)
+    }
     // Strategy can be either a string or an object
     try {
       val abrStrategyPropsString = abrProps.getString(PROP_STRATEGY)
@@ -50,6 +59,18 @@ object ABRConfigurationAdapter {
     }
   }
 
+  private fun preferredMaximumResolutionFromProps(props: ReadableMap?): Size? {
+    if (props == null || !props.hasKey(PROP_WIDTH) || !props.hasKey(PROP_HEIGHT)) {
+      return null
+    }
+    val width = props.getDouble(PROP_WIDTH).toInt()
+    val height = props.getDouble(PROP_HEIGHT).toInt()
+    if (width <= 0 || height <= 0) {
+      return null
+    }
+    return Size(width, height)
+  }
+
   private fun abrMetadataFromProps(props: ReadableMap?): AbrStrategyMetadata? {
     if (props == null) {
       return null

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

@@ -20,6 +20,8 @@ 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.CMCDEndpointConfiguration
+import com.theoplayer.android.api.cmcd.CMCDSourceConfiguration
 import com.theoplayer.android.api.cmcd.CMCDTransmissionMode
 import com.theoplayer.android.api.error.ErrorCode
 import com.theoplayer.android.api.source.AdIntegration
@@ -94,6 +96,11 @@ private const val TYPE_MILLICAST = "millicast"
 
 private const val PROP_CMCD = "cmcd"
 private const val CMCD_TRANSMISSION_MODE = "transmissionMode"
+private const val CMCD_SESSION_ID = "sessionID"
+private const val CMCD_EXTERNAL_SESSION_ID = "externalSessionId"
+private const val CMCD_USER_ID = "userId"
+private const val CMCD_EVENT_ENDPOINTS = "eventEndpoints"
+private const val CMCD_ENDPOINT_URL = "url"
 
 class SourceAdapter {
   private val gson = Gson()
@@ -175,6 +182,11 @@ class SourceAdapter {
       if (metadataDescription != null) {
         builder.metadata(metadataDescription)
       }
+      if (jsonSourceObject.has(PROP_CMCD)) {
+        parseCmcdSourceConfiguration(jsonSourceObject.getJSONObject(PROP_CMCD))?.let {
+          builder.cmcd(it)
+        }
+      }
       return builder.build()
     } catch (e: JSONException) {
       e.printStackTrace()
@@ -464,7 +476,10 @@ class SourceAdapter {
     return BridgeUtils.fromJSONObjectToBridge(JSONObject(gson.toJson(typedSource)))
   }
 
-  private fun parseCmcdTransmissionMode(cmcdConfiguration : JSONObject) : CMCDTransmissionMode {
+  private fun parseCmcdTransmissionMode(cmcdConfiguration : JSONObject) : CMCDTransmissionMode? {
+    if (!cmcdConfiguration.has(CMCD_TRANSMISSION_MODE)) {
+      return null
+    }
     try {
       val transmissionMode = cmcdConfiguration.optInt(CMCD_TRANSMISSION_MODE)
       if (transmissionMode == CmcdTransmissionMode.QUERY_ARGUMENT.ordinal) {
@@ -476,4 +491,26 @@ class SourceAdapter {
       return CMCDTransmissionMode.HTTP_HEADER
     }
   }
+
+  private fun parseCmcdSourceConfiguration(cmcdJson: JSONObject): CMCDSourceConfiguration? {
+    val sessionId = cmcdJson.optString(CMCD_SESSION_ID, null)
+    val externalSessionId = cmcdJson.optString(CMCD_EXTERNAL_SESSION_ID, null)
+    val userId = cmcdJson.optString(CMCD_USER_ID, null)
+    val endpoints = cmcdJson.optJSONArray(CMCD_EVENT_ENDPOINTS)?.let { arr ->
+      (0 until arr.length()).mapNotNull { i ->
+        arr.optJSONObject(i)?.optString(CMCD_ENDPOINT_URL)?.let { url ->
+          CMCDEndpointConfiguration(url = url)
+        }
+      }
+    }
+    if (sessionId == null && externalSessionId == null && userId == null && endpoints == null) {
+      return null
+    }
+    return CMCDSourceConfiguration(
+      sessionId = sessionId,
+      externalSessionId = externalSessionId,
+      userId = userId,
+      eventEndpoints = endpoints
+    )
+  }
 }

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_IN_BAND_METADATA_TRACK_DISPATCH_TYPE = "inBandMetadataTrackDispatchType"
 private const val PROP_CAPTION_CHANNEL = "captionChannel"
 private const val PROP_AUDIO_SAMPLING_RATE = "audioSamplingRate"
 private const val PROP_BANDWIDTH = "bandwidth"
@@ -71,6 +72,7 @@ object TrackListAdapter {
     textTrackPayload.putBoolean(PROP_FORCED, textTrack.isForced)
 
     // THEOplayer v10.13+
+    textTrackPayload.putString(PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE, textTrack.inBandMetadataTrackDispatchType ?: "")
     textTrack.captionChannel?.let { textTrackPayload.putInt(PROP_CAPTION_CHANNEL, it) }
 
     // Optionally pass cue list.

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -281,11 +281,13 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                let player = theView.player {
                 let uidValue = uid.intValue
                 let textTracks: TextTrackList = player.textTracks
-                guard textTracks.count > 0 else {
+                let textTrackCount = textTracks.count
+                guard textTrackCount > 0 else {
                     return
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Showing textTrack \(uidValue) on TheoPlayer") }
-                for i in 0...textTracks.count-1 {
+                for i in 0..<textTrackCount {
+                    guard i < textTracks.count else { break }
                     let textTrack: TextTrack = textTracks.get(i)
                     if textTrack.uid == uidValue {
                         textTrack.mode = TextTrackMode.showing
@@ -304,11 +306,13 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                let player = theView.player {
                 let uidValue = uid.intValue
                 let audioTracks: AudioTrackList = player.audioTracks
-                guard audioTracks.count > 0 else {
+                let audioTrackCount = audioTracks.count
+                guard audioTrackCount > 0 else {
                     return
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling audioTrack \(uidValue) on TheoPlayer") }
-                for i in 0...audioTracks.count-1 {
+                for i in 0..<audioTrackCount {
+                    guard i < audioTracks.count else { break }
                     let audioTrack: MediaTrack = audioTracks.get(i)
                     audioTrack.enabled = (audioTrack.uid == uidValue)
                 }
@@ -323,11 +327,13 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                let player = theView.player {
                 let uidValue = uid.intValue
                 let videoTracks: VideoTrackList = player.videoTracks
-                guard videoTracks.count > 0 else {
+                let videoTrackCount = videoTracks.count
+                guard videoTrackCount > 0 else {
                     return
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling videoTrack \(uidValue) on TheoPlayer") }
-                for i in 0...videoTracks.count-1 {
+                for i in 0..<videoTrackCount {
+                    guard i < videoTracks.count else { break }
                     let videoTrack: MediaTrack = videoTracks.get(i)
                     videoTrack.enabled = (videoTrack.uid == uidValue)
                 }
@@ -341,27 +347,37 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             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 {
+                let videoTrackCount = videoTracks.count
+                guard videoTrackCount > 0 else {
                     return
                 }
                 var activeVideoTrack: VideoTrack?
-                for i in 0...videoTracks.count-1 {
+                for i in 0..<videoTrackCount {
+                    guard i < videoTracks.count else { break }
                     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 requestedBandwidths = Set(uids.map { $0.intValue })
+                    let currentBandwidths = Set(foundTrack.targetQualities?.map { $0.bandwidth } ?? [])
+                    guard requestedBandwidths != currentBandwidths else {
+                        if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) already set on active videotrack. Skipping update.") }
+                        return
+                    }
+                    let qualityCount = foundTrack.qualities.count
+                    let matchingQualities = (0..<qualityCount).compactMap { index -> Quality? in
+                        guard index < foundTrack.qualities.count else { return nil }
                         let quality = foundTrack.qualities.get(index)
-                        return uids.contains { $0.intValue == quality.bandwidth } ? quality : nil
+                        return uids.contains(where: { $0.intValue == quality.bandwidth }) ? quality : nil
                     }
-                    foundTrack.targetQualities = matchingQualities.count > 0 ? matchingQualities : nil
+                    foundTrack.targetQualities = matchingQualities.isEmpty ? nil : matchingQualities
                     if DEBUG_PLAYER_API {
                         if matchingQualities.count > 0 {
-                            if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack. (matching: \(matchingQualities.map(\.bandwidth)))") }
+                            PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack. (matching: \(matchingQualities.map(\.bandwidth)))")
                         } else {
-                            if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack. (no match or empty) => no quality restriction.") }
+                            PrintUtils.printLog(logText: "[NATIVE] targetQualities: \(uids) set on active videotrack. (no match or empty) => no quality restriction.")
                         }
                     }
                 }

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -64,6 +64,7 @@ let SD_PROP_INITIALIZATION_DELAY: String = "initializationDelay"
 let SD_PROP_HLS_DATE_RANGE: String = "hlsDateRange"
 let SD_PROP_BREAK_MANIFEST_URL: String = "breakManifestUrl"
 let SD_PROP_CMCD: String = "cmcd"
+let SD_PROP_TRANSMISSION_MODE: String = "transmissionMode"
 let SD_PROP_QUERY_PARAMETERS: String = "queryParameters"
 
 let EXTENSION_HLS: String = ".m3u8"
@@ -167,11 +168,15 @@ class THEOplayerRCTSourceDescriptionBuilder {
         }
 
         // 6. configure CMCD
-        let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any]
-        if cmcd != nil {
-          typedSources.forEach { typedSource in
-            typedSource.cmcd = true;
+        var cmcdSourceConfig: CMCDSourceConfiguration? = nil
+        if let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any] {
+          let requestModeEnabled = cmcd[SD_PROP_TRANSMISSION_MODE] != nil
+          if requestModeEnabled {
+            typedSources.forEach { typedSource in
+              typedSource.cmcd = true
+            }
           }
+          cmcdSourceConfig = THEOplayerRCTSourceDescriptionBuilder.buildCmcdSourceConfiguration(cmcd)
         }
 
         // 7. construct the SourceDescription
@@ -179,13 +184,33 @@ class THEOplayerRCTSourceDescriptionBuilder {
                                  textTracks: textTrackDescriptions,
                                  ads: adsDescriptions,
                                  poster: poster,
-                                 metadata: metadataDescription)
-
+                                 metadata: metadataDescription,
+                                 cmcdConfiguration: cmcdSourceConfig)
+        
         return (sourceDescription, metadataAndChapterTrackDescriptions)
     }
 
     // MARK: Private build methods
 
+    private static func buildCmcdSourceConfiguration(_ cmcdData: [String:Any]) -> CMCDSourceConfiguration? {
+        let sessionId = cmcdData["sessionID"] as? String
+        let externalSessionId = cmcdData["externalSessionId"] as? String
+        let userId = cmcdData["userId"] as? String
+        let endpoints: [CMCDEndpointConfiguration]? = (cmcdData["eventEndpoints"] as? [[String: Any]])?.compactMap { dict in
+            guard let url = dict["url"] as? String else { return nil }
+            return CMCDEndpointConfiguration(url: url)
+        }
+        if sessionId == nil && externalSessionId == nil && userId == nil && endpoints == nil {
+            return nil
+        }
+        return CMCDSourceConfiguration(
+            sessionId: sessionId,
+            externalSessionId: externalSessionId,
+            userId: userId,
+            eventEndpoints: endpoints
+        )
+    }
+
     /**
      Creates a THEOplayer TypedSource. This requires a source property for non SSAI strreams (either as a string or as an object contiaining a src property). For SSAI streams the TypeSource can be created from the ssai property.
      - returns: a THEOplayer TypedSource. In case of SSAI we  support GoogleDAITypedSource with GoogleDAIVodConfiguration or GoogleDAILiveConfiguration

package/ios/THEOplayerRCTTrackMetadataAggregator.swift

@@ -29,6 +29,7 @@ let PROP_CUE_CONTENT: String = "content"
 let PROP_CUE_CUSTOM_ATTRIBUTES: String = "customAttributes"
 let PROP_SRC: String = "src"
 let PROP_FORCED: String = "forced"
+let PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE: String = "inBandMetadataTrackDispatchType"
 let PROP_START_DATE: String = "startDate"
 let PROP_END_DATE: String = "endDate"
 let PROP_ATTRIBUTE_CLASS: String = "class"
@@ -56,10 +57,12 @@ class THEOplayerRCTTrackMetadataAggregator {
     // MARK: TEXTTRACKS
     class func aggregatedTextTrackListInfo(textTracks: TextTrackList, metadataTracks: [[String:Any]], player: THEOplayer) -> [[String:Any]] {
         var trackEntries:[[String:Any]] = metadataTracks
-        guard textTracks.count > 0 else {
+        let textTrackCount = textTracks.count
+        guard textTrackCount > 0 else {
             return trackEntries
         }
-        for i in 0...textTracks.count-1 {
+        for i in 0..<textTrackCount {
+            guard i < textTracks.count else { break }
             let textTrack: TextTrack = textTracks.get(i)
             trackEntries.append(THEOplayerRCTTrackMetadataAggregator.aggregatedTextTrackInfo(textTrack: textTrack, player: player))
         }
@@ -78,6 +81,7 @@ class THEOplayerRCTTrackMetadataAggregator {
         entry[PROP_TYPE] = textTrack.type
         entry[PROP_SRC] = textTrack.src
         entry[PROP_FORCED] = textTrack.forced
+        entry[PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE] = textTrack.inBandMetadataTrackDispatchType
         // process cues when texttrack contains them
         if !textTrack.cues.isEmpty {
             var cueList: [[String:Any]] = []
@@ -90,10 +94,12 @@ class THEOplayerRCTTrackMetadataAggregator {
     }
     
     private class func selectedTextTrack(textTracks: TextTrackList) -> Int {
-        guard textTracks.count > 0 else {
+        let textTrackCount = textTracks.count
+        guard textTrackCount > 0 else {
             return 0
         }
-        for i in 0...textTracks.count-1 {
+        for i in 0..<textTrackCount {
+            guard i < textTracks.count else { break }
             let textTrack: TextTrack = textTracks.get(i)
             if textTrack.mode == TextTrackMode.showing {
                 return textTrack.uid
@@ -160,10 +166,12 @@ class THEOplayerRCTTrackMetadataAggregator {
     // MARK: AUDIOTRACKS
     private class func aggregatedAudioTrackListInfo(audioTracks: AudioTrackList) -> [[String:Any]] {
         var audioTrackEntries:[[String:Any]] = []
-        guard audioTracks.count > 0 else {
+        let audioTrackCount = audioTracks.count
+        guard audioTrackCount > 0 else {
             return audioTrackEntries
         }
-        for i in 0...audioTracks.count-1 {
+        for i in 0..<audioTrackCount {
+            guard i < audioTracks.count else { break }
             let audioTrack: MediaTrack = audioTracks.get(i) // should be casted to AudioTrack
             audioTrackEntries.append(THEOplayerRCTTrackMetadataAggregator.aggregatedAudioTrackInfo(audioTrack: audioTrack))
         }
@@ -181,7 +189,9 @@ class THEOplayerRCTTrackMetadataAggregator {
         entry[PROP_ENABLED] = audioTrack.enabled
         
         // add known qualities
-        entry[PROP_QUALITIES] = (0..<audioTrack.qualities.count).map { index in
+        let audioQualityCount = audioTrack.qualities.count
+        entry[PROP_QUALITIES] = (0..<audioQualityCount).compactMap { index -> [String:Any]? in
+            guard index < audioTrack.qualities.count else { return nil }
             return THEOplayerRCTTrackMetadataAggregator.aggregatedQualityInfo(quality: audioTrack.qualities.get(index))
         }
         
@@ -193,10 +203,12 @@ class THEOplayerRCTTrackMetadataAggregator {
     }
     
     private class func selectedAudioTrack(audioTracks: AudioTrackList) -> Int {
-        guard audioTracks.count > 0 else {
+        let audioTrackCount = audioTracks.count
+        guard audioTrackCount > 0 else {
             return 0
         }
-        for i in 0...audioTracks.count-1 {
+        for i in 0..<audioTrackCount {
+            guard i < audioTracks.count else { break }
             let audioTrack: MediaTrack = audioTracks.get(i)
             if audioTrack.enabled {
                 return audioTrack.uid
@@ -208,10 +220,12 @@ class THEOplayerRCTTrackMetadataAggregator {
     // MARK: VIDEOTRACKS
     private class func aggregatedVideoTrackListInfo(videoTracks: VideoTrackList) -> [[String:Any]] {
         var videoTrackEntries:[[String:Any]] = []
-        guard videoTracks.count > 0 else {
+        let videoTrackCount = videoTracks.count
+        guard videoTrackCount > 0 else {
             return videoTrackEntries
         }
-        for i in 0...videoTracks.count-1 {
+        for i in 0..<videoTrackCount {
+            guard i < videoTracks.count else { break }
             if let videoTrack: VideoTrack = videoTracks.get(i) as? VideoTrack {
                 videoTrackEntries.append(THEOplayerRCTTrackMetadataAggregator.aggregatedVideoTrackInfo(videoTrack: videoTrack))
             }
@@ -230,7 +244,9 @@ class THEOplayerRCTTrackMetadataAggregator {
         entry[PROP_ENABLED] = videoTrack.enabled
         
         // add known qualities
-        entry[PROP_QUALITIES] = (0..<videoTrack.qualities.count).map { index in
+        let videoQualityCount = videoTrack.qualities.count
+        entry[PROP_QUALITIES] = (0..<videoQualityCount).compactMap { index -> [String:Any]? in
+            guard index < videoTrack.qualities.count else { return nil }
             return THEOplayerRCTTrackMetadataAggregator.aggregatedQualityInfo(quality: videoTrack.qualities.get(index))
         }
         
@@ -243,12 +259,14 @@ class THEOplayerRCTTrackMetadataAggregator {
     }
 
     private class func selectedVideoTrack(videoTracks: VideoTrackList) -> Int {
-        guard videoTracks.count > 0 else {
+        let videoTrackCount = videoTracks.count
+        guard videoTrackCount > 0 else {
             return 0
         }
-        for i in 0...videoTracks.count-1 {
+        for i in 0..<videoTrackCount {
+            guard i < videoTracks.count else { break }
             let videoTrack: MediaTrack = videoTracks.get(i)
-            if videoTracks.get(i).enabled {
+            if videoTrack.enabled {
                 return videoTrack.uid
             }
         }
@@ -274,7 +292,7 @@ class THEOplayerRCTTrackMetadataAggregator {
             "bandwidth": quality.bandwidth,
             "codecs": "",
             "id": identifier,
-            "uid": identifier,
+            "uid": quality.bandwidth,
             "name": label,
             "label": label,
             "available": true,
@@ -311,6 +329,7 @@ class THEOplayerRCTTrackMetadataAggregator {
                     track[PROP_LABEL] = trackDescription.label ?? "no label"
                     track[PROP_TYPE] = "webvtt"
                     track[PROP_SRC] = trackDescription.src.absoluteString
+                    track[PROP_IN_BAND_METADATA_TRACK_DISPATCH_TYPE] = ""
                     var cueList: [[String:Any]] = []
                     var cueIndex = 0
                     for c in cues {

package/ios/THEOplayerRCTView.swift

@@ -48,6 +48,7 @@ public class THEOplayerRCTView: UIView {
     var castConfig = CastConfig()
     var uiConfig = UIConfig()
     var theoliveConfig = THEOliveConfig()
+    var cmcdConfig = CmcdConfig()
     
     public var bypassDropInstanceOnReactLifecycle = false // controls superView detaching behaviour
     
@@ -232,6 +233,7 @@ public class THEOplayerRCTView: UIView {
         config.hlsDateRange = self.hlsDateRange
         config.license = self.license
         config.licenseUrl = self.licenseUrl
+        config.cmcd = self.playerCmcdConfiguration()
         self.player = THEOplayer(configuration: config.build())
         
         self.initAdsIntegration()
@@ -322,6 +324,7 @@ public class THEOplayerRCTView: UIView {
         self.parseUIConfig(configDict: configDict)
         self.parseMediaControlConfig(configDict: configDict)
         self.parseTHEOliveConfig(configDict: configDict)
+        self.parseCmcdConfig(configDict: configDict)
         if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] config prop updated.") }
         
         // Given the bridged config, create the initial THEOplayer instance

package/ios/cmcd/THEOplayerRCTView+CmcdConfig.swift

@@ -0,0 +1,36 @@
+// THEOplayerRCTView+CmcdConfig.swift
+
+import Foundation
+import THEOplayerSDK
+
+struct CmcdConfig {
+    var externalSessionId: String?
+    var userId: String?
+    var eventEndpoints: [CMCDEndpointConfiguration]?
+}
+
+extension THEOplayerRCTView {
+
+    func parseCmcdConfig(configDict: NSDictionary) {
+        if let cmcdDict = configDict["cmcd"] as? NSDictionary {
+            self.cmcdConfig.externalSessionId = cmcdDict["externalSessionId"] as? String
+            self.cmcdConfig.userId = cmcdDict["userId"] as? String
+            self.cmcdConfig.eventEndpoints = (cmcdDict["eventEndpoints"] as? [[String: Any]])?.compactMap { dict -> CMCDEndpointConfiguration? in
+                guard let url = dict["url"] as? String else { return nil }
+                return CMCDEndpointConfiguration(url: url)
+            }
+        }
+    }
+
+    func playerCmcdConfiguration() -> CMCDConfiguration? {
+        let config = self.cmcdConfig
+        if config.externalSessionId == nil && config.userId == nil && config.eventEndpoints == nil {
+            return nil
+        }
+        return CMCDConfiguration(
+            externalSessionId: config.externalSessionId,
+            userId: config.userId,
+            eventEndpoints: config.eventEndpoints
+        )
+    }
+}