react-native-theoplayer 9.1.2 → 9.2.0

package/CHANGELOG.md

@@ -5,6 +5,23 @@ 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.2.0] - 25-05-20
+
+### Added
+
+- Added support for Millicast on iOS, Android and Web.
+- Added support for `TextTrackStyle.edgeColor` on Android.
+- Added support for THEOads on tvOS.
+
+### Fixed
+
+- Fixed an issue where the last cue of a VTT was not parsed if there is no newline after it.
+- Fixed an issue on Android where a conversion build error would occur when targeting SDK version 9.4.
+
+### Changed
+
+- Changed the fullscreen dimensions calculation on iOS to make use of the native screen width and height, while taking into account the device orientation.
+
 ## [9.1.2] - 25-05-14
 
 ### Fixed

package/README.md

@@ -1,6 +1,6 @@
 # React Native THEOplayer
 
-![](./doc/logo-react-native.png) ![](./doc/logo-theo.png)
+<img src="./doc/logo-optiview-dark.png#gh-dark-mode-only" height="120" alt="OptiView logo"><img src="./doc/logo-optiview-light.png#gh-light-mode-only" height="120" alt="OptiView logo"><img src="./doc/logo-react-native.png" height="120" alt="React Native logo">
 
 ## License
 
@@ -183,6 +183,7 @@ This section gives an overview of features, limitations and known issues:
 - [Fullscreen presentation](./doc/fullscreen.md)
 - [Media Caching](./doc/media-caching.md)
 - [Migrating to THEOplayer 9.x🔥](./doc/migrating-to-react-native-theoplayer-9.md)
+- [Millicast](./doc/millicast.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,6 +40,7 @@ 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 enabledMillicast = safeExtGet("THEOplayer_extensionMillicast", 'false').toBoolean()
 
 android {
   compileSdk safeExtGet('THEOplayer_compileSdkVersion', 34)
@@ -76,6 +77,7 @@ android {
     buildConfigField "boolean", "EXTENSION_ADS", "${enabledAds}"
     buildConfigField "boolean", "EXTENSION_CAST", "${enabledCast}"
     buildConfigField "boolean", "EXTENSION_MEDIASESSION", "${enabledMediaSession}"
+    buildConfigField "boolean", "EXTENSION_MILLICAST", "${enabledMillicast}"
 
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
@@ -173,6 +175,16 @@ dependencies {
     println('Disable THEOplayer cast extension.')
     compileOnly "com.theoplayer.theoplayer-sdk-android:integration-cast:$theoplayer_sdk_version"
   }
+
+  if (enabledMillicast) {
+    println('Enable THEOplayer millicast extension.')
+    implementation "com.theoplayer.theoplayer-sdk-android:integration-millicast:${theoplayer_sdk_version}"
+    implementation "com.millicast:millicast-sdk-android:2.0.0"
+  } else {
+    println('Disable THEOplayer millicast extension.')
+    compileOnly "com.theoplayer.theoplayer-sdk-android:integration-millicast:${theoplayer_sdk_version}"
+    compileOnly "com.millicast:millicast-sdk-android:2.0.0"
+  }
 }
 
 // Make sure to align all ads extension versions

package/android/proguard-rules.pro

@@ -2,6 +2,7 @@
 # is disabled: it is expected.
 -dontwarn com.theoplayer.android.api.**
 -dontwarn com.google.android.gms.cast.**
+-dontwarn com.millicast.**
 
 # We rely on gson to instantiate some source classes from json, so make sure they are not obfuscated.
 -keep,includedescriptorclasses class com.theoplayer.android.api.source.** { *; }

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

@@ -26,6 +26,8 @@ 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.millicast.MillicastIntegration
+import com.theoplayer.android.api.millicast.MillicastIntegrationFactory
 import com.theoplayer.android.api.player.Player
 import com.theoplayer.android.api.player.RenderingTarget
 import com.theoplayer.android.connector.mediasession.MediaSessionConnector
@@ -90,6 +92,7 @@ class ReactTHEOplayerContext private constructor(
   @Suppress("UnstableApiUsage")
   var wasPlayingOnHostPause: Boolean = false
   private var isHostPaused: Boolean = false
+  private var millicastIntegration: MillicastIntegration? = null
 
   private val isBackgroundAudioEnabled: Boolean
     get() = backgroundAudioConfig.enabled
@@ -332,6 +335,17 @@ class ReactTHEOplayerContext private constructor(
     } catch (e: Exception) {
       Log.w(TAG, "Failed to configure Cast integration ${e.message}")
     }
+    try {
+      if (BuildConfig.EXTENSION_MILLICAST) {
+        millicastIntegration = MillicastIntegrationFactory.createMillicastIntegration()
+          .also {
+          playerView.player.addIntegration(it)
+        }
+      }
+    } catch (e: Exception) {
+      Log.w(TAG, "Failed to configure Millicast integration ${e.message}")
+    }
+
     // Add other future integrations here.
   }
 

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

@@ -0,0 +1,104 @@
+package com.theoplayer.source
+
+import com.millicast.subscribers.ForcePlayoutDelay
+import com.millicast.subscribers.Option
+import com.theoplayer.BuildConfig
+import com.theoplayer.android.api.error.ErrorCode
+import com.theoplayer.android.api.error.THEOplayerException
+import com.theoplayer.android.api.millicast.MillicastSource
+import org.json.JSONObject
+
+private const val PROP_SRC = "src"
+private const val PROP_STREAM_ACCOUNT_ID = "streamAccountId"
+private const val PROP_API_URL = "apiUrl"
+private const val PROP_SUBSCRIBER_TOKEN = "subscriberToken"
+private const val PROP_CONNECT_OPTIONS = "connectOptions"
+
+private const val BWE_MONITOR_DURATION_US = "bweMonitorDurationUs"
+private const val BWE_RATE_CHANGE_PERCENTAGE = "bweRateChangePercentage"
+private const val DISABLE_AUDIO = "disableAudio"
+private const val DTX = "dtx"
+private const val EXCLUDED_SOURCE_ID = "excludedSourceIds"
+private const val FORCE_PLAYOUT_DELAY = "forcePlayoutDelay"
+private const val MINIMUM_DELAY = "min"
+private const val MAXIMUM_DELAY = "max"
+private const val FORCE_SMOOTH = "forceSmooth"
+private const val JITTER_MINIMUM_DELAY_MS = "jitterMinimumDelayMs"
+private const val MAXIMUM_BITRATE = "maximumBitrate"
+private const val MULTIPLEXED_AUDIO_TRACK = "multiplexedAudioTracks"
+private const val PINNED_SOURCE_ID = "pinnedSourceId"
+private const val RTC_EVENT_LOG_OUTPUT_PATH = "rtcEventLogOutputPath"
+private const val STATS_DELAY_MS = "statsDelayMs"
+private const val STEREO = "stereo"
+private const val UPWARDS_LAYER_WAIT_TIME_MS = "upwardsLayerWaitTimeMs"
+
+private const val ERROR_MILLICAST_NOT_ENABLED = "Millicast support not enabled."
+
+fun parseMillicastSource(jsonTypedSource: JSONObject): MillicastSource {
+  // Check whether the integration was enabled
+  if (!BuildConfig.EXTENSION_MILLICAST) {
+    throw THEOplayerException(ErrorCode.SOURCE_INVALID, ERROR_MILLICAST_NOT_ENABLED)
+  }
+  return MillicastSource(
+    src = jsonTypedSource.optString(PROP_SRC),
+    streamAccountId = jsonTypedSource.optString(PROP_STREAM_ACCOUNT_ID),
+    apiUrl = jsonTypedSource.optString(PROP_API_URL),
+    subscriberToken = when (val token = jsonTypedSource.optString(PROP_SUBSCRIBER_TOKEN)) {
+      "" -> null
+      else -> token
+    },
+    connectOptions = jsonTypedSource.optJSONObject(PROP_CONNECT_OPTIONS)
+      ?.let { buildMillicastConnectOptions(it) }
+  )
+}
+
+private fun buildMillicastConnectOptions(jsonObject: JSONObject): Option {
+  return Option(
+    bweMonitorDurationUs = when (val bweMonitorDurationUs = jsonObject.optInt(BWE_MONITOR_DURATION_US, -1)) {
+      -1 -> null
+      else -> bweMonitorDurationUs
+    },
+    bweRateChangePercentage = when (val bweRateChangePercentage = jsonObject.optDouble(BWE_RATE_CHANGE_PERCENTAGE, -1.0)) {
+      -1.0 -> null
+      else -> bweRateChangePercentage
+    },
+    disableAudio = jsonObject.optBoolean(DISABLE_AUDIO),
+    dtx = jsonObject.optBoolean(DTX),
+    excludedSourceId = when (val excludedSourceId = jsonObject.optJSONArray(EXCLUDED_SOURCE_ID)) {
+      null -> arrayOf()
+      else -> Array(excludedSourceId.length()) {
+        excludedSourceId.getString(it)
+      }
+    },
+    forcePlayoutDelay = jsonObject.optJSONObject(FORCE_PLAYOUT_DELAY)?.let {
+      ForcePlayoutDelay(
+        minimumDelay = it.getInt(MINIMUM_DELAY),
+        maximumDelay = it.getInt(MAXIMUM_DELAY)
+      )
+    },
+    forceSmooth = jsonObject.optBoolean(FORCE_SMOOTH),
+    jitterMinimumDelayMs = jsonObject.optInt(JITTER_MINIMUM_DELAY_MS),
+    maximumBitrate = when (val maximumBitrate = jsonObject.optInt(MAXIMUM_BITRATE, -1)) {
+      -1 -> null
+      else -> maximumBitrate
+    },
+    multiplexedAudioTrack = when (val multiplexedAudioTrack = jsonObject.optString(MULTIPLEXED_AUDIO_TRACK)) {
+      "" -> UByte.MIN_VALUE
+      else -> multiplexedAudioTrack.toUByte()
+    },
+    pinnedSourceId = when (val pinnedSourceId = jsonObject.optString(PINNED_SOURCE_ID)) {
+      "" -> null
+      else -> pinnedSourceId
+    },
+    rtcEventLogOutputPath = jsonObject.optString(RTC_EVENT_LOG_OUTPUT_PATH),
+    statsDelayMs = when (val statsDelayMs = jsonObject.optInt(STATS_DELAY_MS, -1)) {
+      -1 -> 1000
+      else -> statsDelayMs
+    },
+    stereo = jsonObject.optBoolean(STEREO, true),
+    upwardsLayerWaitTimeMs = when (val upwardsLayerWaitTimeMs = jsonObject.optInt(UPWARDS_LAYER_WAIT_TIME_MS, -1)) {
+      -1 -> null
+      else -> upwardsLayerWaitTimeMs
+    }
+  )
+}

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

@@ -79,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 TYPE_MILLICAST = "millicast"
 private const val PLAYBACK_PIPELINE_LEGACY = "legacy"
 
 private const val PROP_CMCD = "cmcd"
@@ -107,7 +108,7 @@ class SourceAdapter {
       // CMCD
       var cmcdTransmissionMode: CMCDTransmissionMode? = null
       if (jsonSourceObject.has(PROP_CMCD)) {
-        cmcdTransmissionMode = parseCmcdTransmissionMode(jsonSourceObject.getJSONObject(PROP_CMCD));
+        cmcdTransmissionMode = parseCmcdTransmissionMode(jsonSourceObject.getJSONObject(PROP_CMCD))
       }
 
       // typed sources
@@ -184,8 +185,9 @@ class SourceAdapter {
   @Throws(THEOplayerException::class)
   private fun parseTypedSource(jsonTypedSource: JSONObject, cmcdTransmissionMode: CMCDTransmissionMode? = null): TypedSource {
     // Some integrations do not support the Builder pattern
-    return when (jsonTypedSource.optString(PROP_INTEGRATION)) {
-      INTEGRATION_THEOLIVE -> parseTheoLiveSource(jsonTypedSource)
+    return when {
+      (jsonTypedSource.optString(PROP_INTEGRATION)) == INTEGRATION_THEOLIVE -> parseTheoLiveSource(jsonTypedSource)
+      (jsonTypedSource.optString(PROP_TYPE)) == TYPE_MILLICAST -> parseMillicastSource(jsonTypedSource)
       else -> parseTypedSourceFromBuilder(jsonTypedSource, cmcdTransmissionMode)
     }
   }
@@ -406,7 +408,7 @@ class SourceAdapter {
   }
 
   private fun parseMetadataDescription(metadataDescription: JSONObject): MetadataDescription {
-    val metadata = HashMap<String, Any>()
+    val metadata = HashMap<String, Any?>()
     val keys = metadataDescription.keys()
     while (keys.hasNext()) {
       val key = keys.next()
@@ -420,7 +422,7 @@ class SourceAdapter {
         Log.w(TAG, "Failed to parse metadata key $key")
       }
     }
-    return MetadataDescription(metadata)
+    return MetadataDescription(metadata as MutableMap<String, Any?>)
   }
 
   private fun parseDashConfig(dashConfig: JSONObject): DashPlaybackConfiguration {

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

@@ -6,6 +6,7 @@ import com.theoplayer.android.api.player.track.texttrack.TextTrackStyle
 
 private const val PROP_BACKGROUND_COLOR = "backgroundColor"
 private const val PROP_EDGE_STYLE = "edgeStyle"
+private const val PROP_EDGE_COLOR = "edgeColor"
 private const val PROP_FONT_COLOR = "fontColor"
 private const val PROP_FONT_FAMILY = "fontFamily"
 private const val PROP_FONT_SIZE = "fontSize"
@@ -30,6 +31,9 @@ object TextTrackStyleAdapter {
     if (props.hasKey(PROP_EDGE_STYLE)) {
       style.edgeType = edgeStyleFromProps(props.getString(PROP_EDGE_STYLE))
     }
+    if (props.hasKey(PROP_EDGE_COLOR)) {
+      style.edgeColor = colorFromBridgeColor(props.getMap(PROP_EDGE_COLOR)) ?: Color.WHITE
+    }
     if (props.hasKey(PROP_FONT_COLOR)) {
       style.fontColor = colorFromBridgeColor(props.getMap(PROP_FONT_COLOR)) ?: Color.WHITE
     }

package/ios/THEOplayerRCTBridge.m

@@ -118,6 +118,8 @@ RCT_EXTERN_METHOD(setTextTrackStyle:(nonnull NSNumber *)node
 RCT_EXTERN_METHOD(setKeepScreenOn:(nonnull NSNumber *)node
                   keepScreenOn:(BOOL)keepScreenOn)
 
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(getUsableScreenDimensions)
+
 @end
 
 // ----------------------------------------------------------------------------

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -383,4 +383,17 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
             }
         }
     }
+    
+    @objc(getUsableScreenDimensions)
+    func getUsableScreenDimensions() -> NSDictionary {
+        let boundsSize: CGSize = UIScreen.main.bounds.size;
+        let smallest = boundsSize.width < boundsSize.height ? boundsSize.width : boundsSize.height
+        let biggest = boundsSize.width < boundsSize.height ? boundsSize.height : boundsSize.width
+#if os(iOS)
+        if UIDevice.current.orientation.isPortrait {
+            return ["width": smallest, "height": biggest] // ios portrait
+        }
+#endif
+        return ["width": biggest, "height": smallest] // ios landscape or tvos
+    }
 }

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -189,7 +189,11 @@ class THEOplayerRCTSourceDescriptionBuilder {
         if let integration = typedSourceData[SD_PROP_INTEGRATION] as? String, integration == "theolive" {
             return THEOplayerRCTSourceDescriptionBuilder.buildTHEOliveDescription(typedSourceData)
         }
-      
+
+        if let type = typedSourceData[SD_PROP_TYPE] as? String, type == "millicast" {
+            return THEOplayerRCTSourceDescriptionBuilder.buildMillicastDescription(typedSourceData)
+        }
+
         if let src = typedSourceData[SD_PROP_SRC] as? String {
         // extract the type
             let type = typedSourceData[SD_PROP_TYPE] as? String ?? THEOplayerRCTSourceDescriptionBuilder.extractMimeType(src)

package/ios/THEOplayerRCTView.swift

@@ -14,6 +14,9 @@ import GoogleInteractiveMediaAds
 #if canImport(THEOplayerGoogleCastIntegration)
 import THEOplayerGoogleCastIntegration
 #endif
+#if canImport(THEOplayerMillicastIntegration)
+import THEOplayerMillicastIntegration
+#endif
 
 public class THEOplayerRCTView: UIView {
     // MARK: Members
@@ -46,7 +49,10 @@ public class THEOplayerRCTView: UIView {
     #if canImport(THEOplayerGoogleCastIntegration)
     var castIntegration: THEOplayerGoogleCastIntegration.CastIntegration?
     #endif
-    
+    #if canImport(THEOplayerMillicastIntegration)
+    var millicastIntegration: THEOplayerMillicastIntegration.MillicastIntegration?
+    #endif
+
     var mediaControlConfig = MediaControlConfig() {
         didSet {
             self.remoteCommandsManager.setMediaControlConfig(mediaControlConfig)
@@ -173,6 +179,7 @@ public class THEOplayerRCTView: UIView {
         self.initAdsIntegration()
         self.initCastIntegration()
         self.initTheoAdsIntegration()
+        self.initMillicastIntegration()
         self.initBackgroundAudio()
         self.initPip()
         return self.player

package/ios/millicast/THEOplayerRCTSourceDescriptionBuilder+Millicast.swift

@@ -0,0 +1,189 @@
+// THEOplayerRCTSourceDescriptionBuilder+Millicast.swift
+
+import Foundation
+import THEOplayerSDK
+import UIKit
+
+#if canImport(THEOplayerMillicastIntegration)
+import MillicastSDK
+import THEOplayerMillicastIntegration
+#endif
+
+let SD_PROP_ACCOUNTID: String = "streamAccountId"
+let SD_PROP_SUBSCRIBERTOKEN: String = "subscriberToken"
+let SD_PROP_CONNECTOPTIONS: String = "connectOptions"
+
+extension THEOplayerRCTSourceDescriptionBuilder {
+
+    /**
+     Builds a THEOplayer SourceDescription that can be passed as a source for the THEOplayer.
+     - returns: a Millicast TypedSource.
+     */
+    static func buildMillicastDescription(_ millicastData: [String:Any]) -> TypedSource? {
+#if canImport(THEOplayerMillicastIntegration)
+      if let src = millicastData[SD_PROP_SRC] as? String,
+         let accountID = millicastData[SD_PROP_ACCOUNTID] as? String {
+        let subscriberToken = millicastData[SD_PROP_SUBSCRIBERTOKEN] as? String;
+        
+        if millicastData[SD_PROP_CONNECTOPTIONS] == nil {
+          return MillicastSource(src: src, streamAccountId: accountID, subscriberToken: subscriberToken)
+        }
+        
+        let dict = millicastData[SD_PROP_CONNECTOPTIONS] as? NSDictionary;
+        let connectOptions = buildConnectOptions(dict)
+        return MillicastSource(src: src, streamAccountId: accountID, subscriberToken: nil, connectOptions: connectOptions)
+      }
+#endif
+      return nil
+    }
+
+#if canImport(THEOplayerMillicastIntegration)
+  static func buildConnectOptions(_ connectOptions: NSDictionary?) -> MCClientOptions {
+    let result: MCClientOptions = .init()
+    if let bweMonitorDurationUs = connectOptions?["bweMonitorDurationUs"] as? NSNumber {
+      result.bweMonitorDurationUs = bweMonitorDurationUs
+    }
+    if let bweRateChangePercentage = connectOptions?["bweRateChangePercentage"] as? NSNumber {
+      result.bweRateChangePercentage = bweRateChangePercentage
+    }
+    if let degradationPreferences = connectOptions?["degradationPreferences"] as? String {
+      switch degradationPreferences {
+      case "balanced":
+        result.degradationPreferences = MCDegradationPreferences.balanced
+      case "disabled":
+        result.degradationPreferences = MCDegradationPreferences.disabled
+      case "maintainFrameRate":
+        result.degradationPreferences = MCDegradationPreferences.maintainFrameRate
+      case "maintainResolution":
+        result.degradationPreferences = MCDegradationPreferences.maintainResolution
+      default:
+        result.degradationPreferences = MCDegradationPreferences.default
+      }
+    }
+    if let disableAudio = connectOptions?["disableAudio"] as? Bool {
+      result.disableAudio = disableAudio
+    }
+    if let dtx = connectOptions?["dtx"] as? Bool {
+      result.dtx = dtx
+    }
+    if let excludedSourceId = connectOptions?["excludedSourceIds"] as? [Any] {
+      result.excludedSourceId = excludedSourceId
+    }
+    if let forcePlayoutDelayDict = connectOptions?["forcePlayoutDelay"] as? NSDictionary,
+       let maximum = forcePlayoutDelayDict["max"] as? Int32,
+       let minimum = forcePlayoutDelayDict["min"] as? Int32 {
+      let forcePlayoutDelay: MCForcePlayoutDelay = .init(min: minimum, max: maximum)
+      result.forcePlayoutDelay = forcePlayoutDelay
+    }
+    if let forceSmooth = connectOptions?["forceSmooth"] as? Bool {
+      result.forceSmooth = forceSmooth
+    }
+    if let jitterMinimumDelayMs = connectOptions?["jitterMinimumDelayMs"] as? Int32 {
+      result.jitterMinimumDelayMs = jitterMinimumDelayMs
+    }
+    if let maximumBitrate = connectOptions?["maximumBitrate"] as? NSNumber {
+      result.maximumBitrate = maximumBitrate
+    }
+    if let multiplexedAudioTrack = connectOptions?["multiplexedAudioTracks"] as? Int32 {
+      result.multiplexedAudioTrack = multiplexedAudioTrack
+    }
+    if let pinnedSourceId = connectOptions?["pinnedSourceId"] as? String {
+      result.pinnedSourceId = pinnedSourceId
+    }
+    if let priority = connectOptions?["priority"] as? NSNumber {
+      result.priority = priority
+    }
+    if let recordStream = connectOptions?["recordStream"] as? Bool {
+      result.recordStream = recordStream
+    }
+    if let rtcEventLogOutputPath = connectOptions?["rtcEventLogOutputPath"] as? String {
+      result.rtcEventLogOutputPath = rtcEventLogOutputPath
+    }
+    if let simulcast = connectOptions?["simulcast"] as? Bool {
+      result.simulcast = simulcast
+    }
+    if let sourceId = connectOptions?["sourceId"] as? String {
+      result.sourceId = sourceId
+    }
+    if let statsDelayMs = connectOptions?["statsDelayMs"] as? Int32 {
+      result.statsDelayMs = statsDelayMs
+    }
+    if let stereo = connectOptions?["stereo"] as? Bool {
+      result.stereo = stereo
+    }
+    if let svcMode = connectOptions?["svcMode"] as? String {
+      switch svcMode {
+      case "l1t2":
+        result.svcMode = MCScalabilityMode.l1t2
+      case "l1t2h":
+        result.svcMode = MCScalabilityMode.l1t2h
+      case "l1t3":
+        result.svcMode = MCScalabilityMode.l1t3
+      case "l1t3h":
+        result.svcMode = MCScalabilityMode.l1t3h
+      case "l2t1":
+        result.svcMode = MCScalabilityMode.l2t1
+      case "l2t1Key":
+        result.svcMode = MCScalabilityMode.l2t1Key
+      case "l2t1h":
+        result.svcMode = MCScalabilityMode.l2t1h
+      case "l2t2":
+        result.svcMode = MCScalabilityMode.l2t2
+      case "l2t2Key":
+        result.svcMode = MCScalabilityMode.l2t2Key
+      case "l2t2KeyShift":
+        result.svcMode = MCScalabilityMode.l2t2KeyShift
+      case "l2t2h":
+        result.svcMode = MCScalabilityMode.l2t2h
+      case "l2t3":
+        result.svcMode = MCScalabilityMode.l2t3
+      case "l2t3h":
+        result.svcMode = MCScalabilityMode.l2t3h
+      case "l3t1":
+        result.svcMode = MCScalabilityMode.l3t1
+      case "l3t2":
+        result.svcMode = MCScalabilityMode.l3t2
+      case "l3t3":
+        result.svcMode = MCScalabilityMode.l3t3
+      case "l3t3Key":
+        result.svcMode = MCScalabilityMode.l3t3Key
+      case "none":
+        result.svcMode = MCScalabilityMode.none
+      case "s2t1":
+        result.svcMode = MCScalabilityMode.s2t1
+      case "s2t1h":
+        result.svcMode = MCScalabilityMode.s2t1h
+      case "s2t2":
+        result.svcMode = MCScalabilityMode.s2t2
+      case "s2t2h":
+        result.svcMode = MCScalabilityMode.s2t2h
+      case "s2t3":
+        result.svcMode = MCScalabilityMode.s2t3
+      case "s2t3h":
+        result.svcMode = MCScalabilityMode.s2t3h
+      case "s3t1":
+        result.svcMode = MCScalabilityMode.s3t1
+      case "s3t1h":
+        result.svcMode = MCScalabilityMode.s3t1h
+      case "s3t2":
+        result.svcMode = MCScalabilityMode.s3t2
+      case "s3t2h":
+        result.svcMode = MCScalabilityMode.s3t2h
+      case "s3t3":
+        result.svcMode = MCScalabilityMode.s3t3
+      case "s3t3h":
+        result.svcMode = MCScalabilityMode.s3t3h
+      default:
+        break
+      }
+    }
+    if let upwardsLayerWaitTimeMs = connectOptions?["upwardsLayerWaitTimeMs"] as? NSNumber {
+      result.upwardsLayerWaitTimeMs = upwardsLayerWaitTimeMs
+    }
+    if let videoCodec = connectOptions?["videoCodec"] as? String {
+      result.videoCodec = videoCodec
+    }
+    return result
+  }
+#endif
+}

package/ios/millicast/THEOplayerRCTView+Millicast.swift

@@ -0,0 +1,21 @@
+// THEOplayerRCTView+Millicast.swift
+
+import Foundation
+import THEOplayerSDK
+
+#if canImport(THEOplayerMillicastIntegration)
+import THEOplayerMillicastIntegration
+#endif
+
+extension THEOplayerRCTView {
+    func initMillicastIntegration() {
+        guard let player = self.player else {
+            return
+        }
+
+#if canImport(THEOplayerMillicastIntegration)
+        self.millicastIntegration = MillicastIntegrationFactory.createIntegration()
+        player.addIntegration(self.millicastIntegration!)
+#endif
+    }
+}

package/ios/sideloadedMetadata/THEOplayerRCTSideloadedMetadataProcessor.swift

@@ -72,7 +72,9 @@ class THEOplayerRCTSideloadedWebVTTProcessor {
                 }
             }
         }
-        
+        if let cue = currentCue {
+          cues.append(cue)                                                  // append last cue if no newline at end of vtt
+        }
         return cues
     }