react-native-theoplayer 7.0.0 → 7.1.0

package/CHANGELOG.md

@@ -5,6 +5,22 @@ 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).
 
+## [7.1.0] - 24-04-23
+
+### Fixed
+
+- Fixed a build issue on tvOS example app due to the deprecated `prepare` method.
+
+### Added
+
+- Added multiple configuration options to `GoogleImaConfiguration` for both iOS and Android. These map to the corresponding IMASettings from the underlying native Google IMA SDKs.
+- Added `skipForwardInterval` and `skipBackwardInterval` properties to `MediaControlConfiguration` for Android and Web, enabling configurable skip intervals for media sessions.
+- Added ios bridging code to make 'forced' property available from native iOS TextTrack API.
+
+### Removed
+
+- Removed support for the web-based native iOS SDK on the RN iOS Bridge.
+
 ## [7.0.0] - 24-04-10
 
 ### Fixed

package/README.md

@@ -168,11 +168,9 @@ This section gives an overview of features, limitations and known issues:
 - [Audio Control Management](./doc/audio-control.md)
 - [Background playback and notifications](./doc/background.md)
 - [Casting with Chromecast and Airplay](./doc/cast.md)
-- [Custom iOS framework](./doc/custom-ios-framework.md)
 - [Digital Rights Management (DRM)](./doc/drm.md)
 - [Fullscreen presentation](./doc/fullscreen.md)
 - [Media Caching](./doc/media-caching.md)
-- [Migrating to `react-native-theoplayer` v2.x](./doc/migrating-v2.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

@@ -118,14 +118,7 @@ dependencies {
   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:6.10.0"
-
-  if (enabledMediaSession) {
-    println("Enable THEOplayer MediaSession extension (${versionString(theoplayer_sdk_version)})")
-    implementation "com.theoplayer.android-connector:mediasession:${theoplayer_sdk_version}"
-  } else {
-    println('Disable THEOplayer MediaSession extension.')
-    compileOnly "com.theoplayer.android-connector:mediasession:${theoplayer_sdk_version}"
-  }
+  implementation "com.theoplayer.android-connector:mediasession:${theoplayer_sdk_version}"
 
   if (enabledGoogleIMA) {
     println('Enable THEOplayer IMA extension.')

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

@@ -6,11 +6,14 @@ import com.google.ads.interactivemedia.v3.api.AdsRenderingSettings
 import com.google.ads.interactivemedia.v3.api.ImaSdkFactory
 import com.google.ads.interactivemedia.v3.api.ImaSdkSettings
 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.pip.PipConfiguration
 import com.theoplayer.android.api.player.NetworkConfiguration
 import com.theoplayer.android.api.ui.UIConfiguration
+import com.theoplayer.media.MediaSessionConfig
+import com.theoplayer.media.MediaSessionConfigAdapter
 
 private const val PROP_LICENSE = "license"
 private const val PROP_LICENSE_URL = "licenseUrl"
@@ -26,7 +29,15 @@ private const val PROP_RETRY_MIN_BACKOFF = "minimumBackoff"
 private const val PROP_RETRY_MAX_BACKOFF = "maximumBackoff"
 private const val PROP_CAST_CONFIGURATION = "cast"
 private const val PROP_ADS_CONFIGURATION = "ads"
+private const val PROP_IMA_CONFIGURATION = "ima"
 private const val PROP_UI_CONFIGURATION = "ui"
+private const val PROP_MEDIA_CONTROL = "mediaControl"
+private const val PROP_PPID = "ppid"
+private const val PROP_MAX_REDIRECTS = "maxRedirects"
+private const val PROP_FEATURE_FLAGS = "featureFlags"
+private const val PROP_AUTOPLAY_AD_BREAKS = "autoPlayAdBreaks"
+private const val PROP_SESSION_ID = "sessionID"
+private const val PROP_ENABLE_DEBUG_MODE = "enableDebugMode"
 
 class PlayerConfigAdapter(private val configProps: ReadableMap?) {
 
@@ -91,8 +102,44 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
    */
   fun imaSdkSettings(): ImaSdkSettings{
     return ImaSdkFactory.getInstance().createImaSdkSettings().apply {
-      configProps?.getMap(PROP_ADS_CONFIGURATION)?.run {
-        // TODO: bridge all settings
+      configProps?.getMap(PROP_ADS_CONFIGURATION)?.getMap(PROP_IMA_CONFIGURATION)?.run {
+        // Specifies whether VMAP and ad rules ad breaks are automatically played.
+        if (hasKey(PROP_AUTOPLAY_AD_BREAKS)) {
+          autoPlayAdBreaks = getBoolean(PROP_AUTOPLAY_AD_BREAKS)
+        }
+        // Feature flags and their states. Used to control experimental features.
+        if (hasKey(PROP_FEATURE_FLAGS)) {
+          val convertedMap: MutableMap<String, String> = mutableMapOf()
+          getMap(PROP_FEATURE_FLAGS)?.toHashMap()?.forEach { (key, value) ->
+            convertedMap[key] = value as String
+          }
+          featureFlags = convertedMap
+        }
+        // The current ISO 639-1 language code, get it from the UI config.
+        uiConfig().language?.let {
+          language = it
+        }
+        // The maximum number of VAST redirects.
+        if (hasKey(PROP_MAX_REDIRECTS)) {
+          maxRedirects = getInt(PROP_MAX_REDIRECTS)
+        }
+        // The partner provided player type.
+        playerType = "THEOplayer"
+        // The partner provided player version.
+        playerVersion = THEOplayerGlobal.getVersion()
+        // The Publisher Provided Identification (PPID) sent with ads request.
+        if (hasKey(PROP_PPID)) {
+          ppid = 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) ?: ""
+        }
+        // Toggles debug mode which will output detailed log information to the console.
+        if (hasKey(PROP_ENABLE_DEBUG_MODE)) {
+          isDebugMode = getBoolean(PROP_ENABLE_DEBUG_MODE)
+        }
       }
     }
   }
@@ -154,4 +201,14 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
       else -> null
     }
   }
+
+  /**
+   * Get MediaSession connector configuration; these properties apply:
+   * - mediaSessionEnabled: whether or not the media session should be enabled.
+   * - skipForwardInterval: the amount of seconds the player will skip forward.
+   * - skipBackwardInterval: the amount of seconds the player will skip backward.
+   */
+  fun mediaSessionConfig(): MediaSessionConfig {
+    return MediaSessionConfigAdapter.fromProps(configProps?.getMap(PROP_MEDIA_CONTROL))
+  }
 }

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

@@ -28,6 +28,7 @@ import com.theoplayer.audio.AudioBecomingNoisyManager
 import com.theoplayer.audio.AudioFocusManager
 import com.theoplayer.audio.BackgroundAudioConfig
 import com.theoplayer.media.MediaPlaybackService
+import com.theoplayer.media.MediaSessionConfig
 import java.util.concurrent.atomic.AtomicBoolean
 
 private const val TAG = "ReactTHEOplayerContext"
@@ -42,7 +43,8 @@ private const val ALLOWED_PLAYBACK_ACTIONS = (
     PlaybackStateCompat.ACTION_SET_PLAYBACK_SPEED)
 
 class ReactTHEOplayerContext private constructor(
-  private val reactContext: ThemedReactContext
+  private val reactContext: ThemedReactContext,
+  private val configAdapter: PlayerConfigAdapter
 ) {
   private val mainHandler = Handler(Looper.getMainLooper())
   private var isBound = AtomicBoolean()
@@ -60,6 +62,12 @@ class ReactTHEOplayerContext private constructor(
       field = value
     }
 
+  var mediaSessionConfig: MediaSessionConfig = configAdapter.mediaSessionConfig()
+    set(value) {
+      applyMediaSessionConfig(mediaSessionConnector, value)
+      field = value
+    }
+
   lateinit var playerView: THEOplayerView
 
   val player: Player
@@ -85,8 +93,8 @@ class ReactTHEOplayerContext private constructor(
       reactContext: ThemedReactContext,
       configAdapter: PlayerConfigAdapter
     ): ReactTHEOplayerContext {
-      return ReactTHEOplayerContext(reactContext).apply {
-        initializePlayerView(configAdapter)
+      return ReactTHEOplayerContext(reactContext, configAdapter).apply {
+        initializePlayerView()
       }
     }
   }
@@ -96,9 +104,9 @@ class ReactTHEOplayerContext private constructor(
       binder = service as MediaPlaybackService.MediaPlaybackBinder
 
       // Get media session connector from service
-      mediaSessionConnector = binder?.mediaSessionConnector
-      mediaSessionConnector?.player = player
-      mediaSessionConnector?.setMediaSessionMetadata(player.source)
+      mediaSessionConnector = binder?.mediaSessionConnector?.also {
+        applyMediaSessionConfig(it, mediaSessionConfig)
+      }
 
       // Pass player context
       binder?.setPlayerContext(this@ReactTHEOplayerContext)
@@ -184,7 +192,7 @@ class ReactTHEOplayerContext private constructor(
     binder = null
   }
 
-  private fun initializePlayerView(configAdapter: PlayerConfigAdapter) {
+  private fun initializePlayerView() {
     playerView = object : THEOplayerView(reactContext.currentActivity!!, configAdapter.playerConfig()) {
       private fun measureAndLayout() {
         measure(
@@ -205,7 +213,7 @@ class ReactTHEOplayerContext private constructor(
     // By default, the screen should remain on.
     playerView.keepScreenOn = true
 
-    addIntegrations(configAdapter)
+    addIntegrations()
     addListeners()
 
     audioFocusManager = AudioFocusManager(reactContext, player)
@@ -229,17 +237,30 @@ class ReactTHEOplayerContext private constructor(
     mediaSession.setMediaButtonReceiver(null)
 
     // Create a MediaSessionConnector and attach the THEOplayer instance.
-    mediaSessionConnector = MediaSessionConnector(mediaSession).apply {
+    mediaSessionConnector = MediaSessionConnector(mediaSession).also {
+      applyMediaSessionConfig(it, mediaSessionConfig)
+    }
+  }
+
+  private fun applyMediaSessionConfig(connector: MediaSessionConnector?, config: MediaSessionConfig) {
+    connector?.apply {
       debug = BuildConfig.LOG_MEDIASESSION_EVENTS
+
       player = this@ReactTHEOplayerContext.player
 
       // Set mediaSession active and ready to receive media button events, but not if the player
       // is backgrounded.
-      setActive(!isHostPaused)
+      setActive(!isHostPaused && BuildConfig.EXTENSION_MEDIASESSION && config.mediaSessionEnabled)
+
+      skipForwardInterval = config.skipForwardInterval
+      skipBackwardsInterval = config.skipBackwardInterval
+
+      // Pass metadata from source description
+      setMediaSessionMetadata(player?.source)
     }
   }
 
-  private fun addIntegrations(configAdapter: PlayerConfigAdapter) {
+  private fun addIntegrations() {
     try {
       if (BuildConfig.EXTENSION_GOOGLE_IMA) {
         imaIntegration = GoogleImaIntegrationFactory.createGoogleImaIntegration(
@@ -357,7 +378,7 @@ class ReactTHEOplayerContext private constructor(
    */
   fun onHostResume() {
     isHostPaused = false
-    mediaSessionConnector?.setActive(true)
+    mediaSessionConnector?.setActive(BuildConfig.EXTENSION_MEDIASESSION)
     playerView.onResume()
     if (!player.isPaused) {
       audioFocusManager?.retrieveAudioFocus()

package/android/src/main/java/com/theoplayer/media/MediaPlaybackService.kt

@@ -173,7 +173,7 @@ class MediaPlaybackService : MediaBrowserServiceCompat() {
       debug = BuildConfig.LOG_MEDIASESSION_EVENTS
 
       // Set mediaSession active
-      setActive(true)
+      setActive(BuildConfig.EXTENSION_MEDIASESSION)
     }
 
     // Set the MediaBrowserServiceCompat's media session.

package/android/src/main/java/com/theoplayer/media/MediaSessionConfig.kt

@@ -0,0 +1,18 @@
+package com.theoplayer.media
+
+data class MediaSessionConfig (
+  /**
+   * Whether or not the media session should be enabled.
+   */
+  var mediaSessionEnabled: Boolean = true,
+
+  /**
+   * The amount of seconds the player will skip forward.
+   */
+  var skipForwardInterval: Double = 5.0,
+
+  /**
+   * The amount of seconds the player will skip backward.
+   */
+  var skipBackwardInterval: Double = 5.0,
+)

package/android/src/main/java/com/theoplayer/media/MediaSessionConfigAdapter.kt

@@ -0,0 +1,23 @@
+package com.theoplayer.media
+
+import com.facebook.react.bridge.ReadableMap
+
+object MediaSessionConfigAdapter {
+  private const val PROP_ENABLED = "mediaSessionEnabled"
+  private const val PROP_SKIP_FORWARD_INTERVAL = "skipForwardInterval"
+  private const val PROP_SKIP_BACKWARD_INTERVAL = "skipBackwardInterval"
+
+  fun fromProps(props: ReadableMap?): MediaSessionConfig {
+    return MediaSessionConfig().apply {
+      if (props?.hasKey(PROP_ENABLED) == true) {
+        mediaSessionEnabled = props.getBoolean(PROP_ENABLED)
+      }
+      if (props?.hasKey(PROP_SKIP_FORWARD_INTERVAL) == true) {
+        skipForwardInterval = props.getDouble(PROP_SKIP_FORWARD_INTERVAL)
+      }
+      if (props?.hasKey(PROP_SKIP_BACKWARD_INTERVAL) == true) {
+        skipBackwardInterval = props.getDouble(PROP_SKIP_BACKWARD_INTERVAL)
+      }
+    }
+  }
+}

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -352,17 +352,7 @@ class THEOplayerRCTSourceDescriptionBuilder {
     static func buildContentProtection(_ contentProtectionData: [String:Any]) -> MultiplatformDRMConfiguration? {
         do {
             let data = try JSONSerialization.data(withJSONObject: contentProtectionData)
-            if let integration = contentProtectionData[SD_PROP_INTEGRATION] as? String {
-                switch integration {
-                case DRM_INTEGRATION_ID_EZDRM: return try JSONDecoder().decode(EzdrmDRMConfiguration.self, from: data)
-                case DRM_INTEGRATION_ID_KEYOS: return try JSONDecoder().decode(KeyOSDRMConfiguration.self, from: data)
-                case DRM_INTEGRATION_ID_VERIMATRIX: return try JSONDecoder().decode(VerimatrixDRMConfiguration.self, from: data)
-                default: return try JSONDecoder().decode(MultiplatformDRMConfiguration.self, from: data)
-                }
-            } else {
-                PrintUtils.printLog(logText: "[NATIVE] integration type not specified... trying default drm integration")
-                return try JSONDecoder().decode(MultiplatformDRMConfiguration.self, from: data)
-            }
+            return try JSONDecoder().decode(MultiplatformDRMConfiguration.self, from: data)
         } catch {
             PrintUtils.printLog(logText: "[NATIVE] unsupported contentProtection data format")
         }

package/ios/THEOplayerRCTTrackMetadataAggregator.swift

@@ -26,6 +26,7 @@ let PROP_CUES: String = "cues"
 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_START_DATE: String = "startDate"
 let PROP_END_DATE: String = "endDate"
 let PROP_ATTRIBUTE_CLASS: String = "class"
@@ -73,6 +74,7 @@ class THEOplayerRCTTrackMetadataAggregator {
         entry[PROP_LABEL] = textTrack.label
         entry[PROP_TYPE] = textTrack.type
         entry[PROP_SRC] = textTrack.src
+        entry[PROP_FORCED] = textTrack.forced
         // process cues when texttrack contains them
         if !textTrack.cues.isEmpty {
             var cueList: [[String:Any]] = []

package/ios/ads/THEOplayerRCTAdsAPI+DAI.swift

@@ -11,7 +11,7 @@ let ERROR_MESSAGE_DAI_GET_SNAPBACK_UNDEFINED = "Undefined dai snapback"
 
 extension THEOplayerRCTAdsAPI {
     
-#if GOOGLE_DAI || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
     @objc(daiSnapback:resolver:rejecter:)
     func daiSnapback(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
         DispatchQueue.main.async {

package/ios/ads/THEOplayerRCTAdsAPI.swift

@@ -34,7 +34,7 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
         return false
     }
 
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
     @objc(skip:)
     func skip(_ node: NSNumber) -> Void {
 

package/ios/ads/THEOplayerRCTAdsEventHandler.swift

@@ -54,7 +54,7 @@ class THEOplayerRCTAdsEventHandler {
             return
         }
         
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         // AD_BEGIN
         self.adBeginListener = player.ads.addEventListener(type: AdsEventTypes.AD_BEGIN) { [weak self] event in
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received AD_BEGIN event from THEOplayer Ads") }
@@ -180,7 +180,7 @@ class THEOplayerRCTAdsEventHandler {
             return
         }
         
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         // AD_BEGIN
         if let adBeginListener = self.adBeginListener {
             player.ads.removeEventListener(type: AdsEventTypes.AD_BEGIN, listener: adBeginListener)

package/ios/ads/THEOplayerRCTSourceDescriptionBuilder+Ads.swift

@@ -15,7 +15,7 @@ extension THEOplayerRCTSourceDescriptionBuilder {
     static func buildAdDescriptions(_ sourceData: NSDictionary) -> [AdDescription]? {
         var adsDescriptions: [AdDescription]?
 
-#if GOOGLE_IMA || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         if let ads = sourceData[SD_PROP_ADS] {
             adsDescriptions = []
             // case: array of ads objects
@@ -53,7 +53,7 @@ extension THEOplayerRCTSourceDescriptionBuilder {
      - returns: a THEOplayer GoogleImaAdDescription
      */
     static func buildSingleAdDescription(_ adsData: [String:Any]) -> AdDescription? {
-#if GOOGLE_IMA || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         if let integration = adsData[SD_PROP_INTEGRATION] as? String,
            integration == AdIntegration.google_ima._rawValue {
             // timeOffset can be Int or String: 10, "01:32:54.78", "1234.56", "start", "end", "10%", ...
@@ -77,7 +77,7 @@ extension THEOplayerRCTSourceDescriptionBuilder {
     }
 
     static func buildDAITypedSource(_ typedSourceData: [String:Any], contentProtection: MultiplatformDRMConfiguration?) -> TypedSource? {
-#if GOOGLE_DAI || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         // check for alternative Google DAI SSAI
         if let ssaiData = typedSourceData[SD_PROP_SSAI] as? [String:Any] {
             if let integration = ssaiData[SD_PROP_INTEGRATION] as? String,

package/ios/ads/THEOplayerRCTView+Ads.swift

@@ -5,6 +5,7 @@ import THEOplayerSDK
 
 #if canImport(THEOplayerGoogleIMAIntegration)
 import THEOplayerGoogleIMAIntegration
+import GoogleInteractiveMediaAds
 #endif
 
 extension THEOplayerRCTView {
@@ -21,7 +22,40 @@ extension THEOplayerRCTView {
             return
         }
 #if canImport(THEOplayerGoogleIMAIntegration)
-        let imaIntegration = GoogleIMAIntegrationFactory.createIntegration(on: player)
+        // prepare imaSettings
+        let imaSettings = IMASettings()
+        imaSettings.language = self.uiConfig.language
+        imaSettings.maxRedirects = self.adsConfig.adsImaConfig.maxRedirects
+        imaSettings.enableDebugMode = self.adsConfig.adsImaConfig.enableDebugMode
+        imaSettings.playerType = "THEOplayer"
+        imaSettings.playerVersion = THEOplayer.version
+        imaSettings.enableBackgroundPlayback = true
+        if let ppid = self.adsConfig.adsImaConfig.ppid {
+            imaSettings.ppid = ppid
+        }
+        #if os(iOS)
+        if let featureFlags = self.adsConfig.adsImaConfig.featureFlags {
+            imaSettings.featureFlags = featureFlags
+        }
+        #endif
+        if let autoPlayAdBreaks = self.adsConfig.adsImaConfig.autoPlayAdBreaks {
+            imaSettings.autoPlayAdBreaks = autoPlayAdBreaks
+        }
+        if let sessionID = self.adsConfig.adsImaConfig.sessionID {
+            imaSettings.sessionID = sessionID
+        }
+        
+        // setup ima render settings
+        let imaRenderSettings = IMAAdsRenderingSettings()
+        let disableUi = !self.adsConfig.adSUIEnabled
+        if disableUi {
+            imaRenderSettings.disableUi = disableUi
+            imaRenderSettings.uiElements = []
+        }
+        
+        // setup integration
+        let imaIntegration = GoogleIMAIntegrationFactory.createIntegration(on: player, with: imaSettings)
+        imaIntegration.renderingSettings = imaRenderSettings
         player.addIntegration(imaIntegration)
 #endif
     }

package/ios/ads/THEOplayerRCTView+AdsConfig.swift

@@ -6,6 +6,16 @@ import THEOplayerSDK
 struct AdsConfig {
     var adSUIEnabled: Bool = true
     var adPreloadTypeString: String = "none"
+    var adsImaConfig = AdsImaConfig()
+}
+
+struct AdsImaConfig {
+    var maxRedirects: UInt = 4
+    var enableDebugMode: Bool = false
+    var ppid: String?
+    var featureFlags: [String:String]?
+    var autoPlayAdBreaks: Bool?
+    var sessionID: String?
 }
 
 #if os(iOS)
@@ -18,23 +28,32 @@ extension THEOplayerRCTView {
             if let adPreloadType = adsConfig["preload"] as? String {
                 self.adsConfig.adPreloadTypeString = adPreloadType
             }
+            if let adsImaConfig = adsConfig["ima"] as? NSDictionary {
+                if let ppid = adsImaConfig["ppid"] as? String {
+                    self.adsConfig.adsImaConfig.ppid = ppid
+                }
+                if let maxRedirects = adsImaConfig["maxRedirects"] as? UInt {
+                    self.adsConfig.adsImaConfig.maxRedirects = maxRedirects
+                }
+                if let featureFlags = adsImaConfig["featureFlags"] as? [String:String] {
+                    self.adsConfig.adsImaConfig.featureFlags = featureFlags
+                }
+                if let autoPlayAdBreaks = adsImaConfig["autoPlayAdBreaks"] as? Bool {
+                    self.adsConfig.adsImaConfig.autoPlayAdBreaks = autoPlayAdBreaks
+                }
+                if let sessionID = adsImaConfig["sessionID"] as? String {
+                    self.adsConfig.adsImaConfig.sessionID = sessionID
+                }
+                if let enableDebugMode = adsImaConfig["enableDebugMode"] as? Bool {
+                    self.adsConfig.adsImaConfig.enableDebugMode = enableDebugMode
+                }
+            }
         }
     }
 
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
     func playerAdsConfiguration() -> AdsConfiguration? {
-        let googleBuilder = GoogleIMAConfigurationBuilder()
-        googleBuilder.disableUI = !self.adsConfig.adSUIEnabled
-        googleBuilder.enableBackgroundPlayback = true
-        let googleIMAAdsConfiguration = googleBuilder.build()
-        let daiBuilder = GoogleDAIAdsConfigurationBuilder()
-        daiBuilder.disableUI = !self.adsConfig.adSUIEnabled
-        daiBuilder.enableBackgroundPlayback = true
-        let googleDaiAdsConfiguration = daiBuilder.build()
-        return AdsConfiguration(showCountdown: self.adsConfig.adSUIEnabled,
-                                preload: self.adPreloadType(),
-                                googleIma: googleIMAAdsConfiguration,
-                                googleDai: googleDaiAdsConfiguration)
+        return AdsConfiguration(showCountdown: self.adsConfig.adSUIEnabled, preload: self.adPreloadType())
     }
     
     private func adPreloadType() -> THEOplayerSDK.AdPreloadType {
@@ -59,7 +78,7 @@ extension THEOplayerRCTView {
     
     func parseAdsConfig(configDict: NSDictionary) {}
     
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
     func playerAdsConfiguration() -> AdsConfiguration? { return AdsConfiguration() }
 #else
     func playerAdsConfiguration() -> AdsConfiguration? { return nil }

package/ios/backgroundAudio/THEOplayerRCTRemoteCommandsManager.swift

@@ -193,7 +193,7 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
             self?.updateRemoteCommands()
         }
         
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         
         // ADBREAK_BEGIN
         self.adBreakBeginListener = player.ads.addEventListener(type: AdsEventTypes.AD_BREAK_BEGIN) { [weak self] event in
@@ -226,7 +226,7 @@ class THEOplayerRCTRemoteCommandsManager: NSObject {
             player.removeEventListener(type: PlayerEventTypes.SOURCE_CHANGE, listener: sourceChangeListener)
         }
         
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         
         // ADBREAK_BEGIN
         if let adBreakBeginListener = self.adBreakBeginListener {

package/ios/backgroundAudio/THEOplayerRCTView+BackgroundAudioConfig.swift

@@ -7,16 +7,6 @@ struct BackgroundAudioConfig {
     var enabled: Bool = false
 }
 
-#if WEB
-
-extension THEOplayerRCTView {
-    func initBackgroundAudio() {}
-    func destroyBackgroundAudio() {}
-    public func shouldContinueAudioPlaybackInBackground() -> Bool { return false }
-}
-
-#else
-
 extension THEOplayerRCTView: BackgroundPlaybackDelegate {
 
     func initBackgroundAudio() {
@@ -41,5 +31,3 @@ extension THEOplayerRCTView: BackgroundPlaybackDelegate {
 struct DefaultBackgroundPlaybackDelegate: BackgroundPlaybackDelegate {
     func shouldContinueAudioPlaybackInBackground() -> Bool { false }
 }
-
-#endif

package/ios/pip/THEOplayerRCTPipControlsManager.swift

@@ -43,7 +43,7 @@ class THEOplayerRCTPipControlsManager: NSObject {
         if let player = self.player,
            let duration = player.duration {
             self.isLive = duration.isInfinite
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
             self.inAd = player.ads.playing
             self.updatePipControls()
 #else
@@ -91,7 +91,7 @@ class THEOplayerRCTPipControlsManager: NSObject {
             self?.updatePipControls()
         }
         
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         
         // ADBREAK_BEGIN
         self.adBreakBeginListener = player.ads.addEventListener(type: AdsEventTypes.AD_BREAK_BEGIN) { [weak self] event in
@@ -122,7 +122,7 @@ class THEOplayerRCTPipControlsManager: NSObject {
             player.removeEventListener(type: PlayerEventTypes.SOURCE_CHANGE, listener: sourceChangeListener)
         }
         
-#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
+#if canImport(THEOplayerGoogleIMAIntegration)
         
         // ADBREAK_BEGIN
         if let adBreakBeginListener = self.adBreakBeginListener {

package/lib/commonjs/internal/THEOplayerView.web.js

@@ -21,16 +21,26 @@ function THEOplayerView(props) {
     // Create player inside container.
     if (container.current) {
       const chromeless = config?.chromeless === true || config?.chromeless === undefined;
+      const ads = {
+        ...config?.ads,
+        googleIma: {
+          useNativeIma: true,
+          language: config?.ui?.language ?? 'en'
+        }
+      };
       const updatedConfig = {
         ...config,
-        allowNativeFullscreen: true
+        allowNativeFullscreen: true,
+        ads
       };
       if (chromeless) {
         player.current = new _theoplayer.ChromelessPlayer(container.current, updatedConfig);
       } else {
         player.current = new _theoplayer.Player(container.current, {
           ...updatedConfig,
+          ads,
           ui: {
+            ...config?.ui,
             fluid: true
           }
         });

package/lib/commonjs/internal/THEOplayerView.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_theoplayer","_THEOplayerWebAdapter","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","THEOplayerView","props","config","children","player","useRef","adapter","container","useEffect","current","chromeless","undefined","updatedConfig","allowNativeFullscreen","ChromelessPlayer","Player","ui","fluid","THEOplayerWebAdapter","window","nativePlayer","onPlayerReady","onPlayerDestroy","destroy","createElement","Fragment","ref","style","styles","className","display","position","width","height","maxHeight","maxWidth","aspectRatio"],"sourceRoot":"../../../src","sources":["internal/THEOplayerView.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_theoplayer","_THEOplayerWebAdapter","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","THEOplayerView","props","config","children","player","useRef","adapter","container","useEffect","current","chromeless","undefined","ads","googleIma","useNativeIma","language","ui","updatedConfig","allowNativeFullscreen","ChromelessPlayer","Player","fluid","THEOplayerWebAdapter","window","nativePlayer","onPlayerReady","onPlayerDestroy","destroy","createElement","Fragment","ref","style","styles","className","display","position","width","height","maxHeight","maxWidth","aspectRatio"],"sourceRoot":"../../../src","sources":["internal/THEOplayerView.web.tsx"],"mappings":"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","ignoreList":[]}