react-native-theoplayer 9.10.0 → 10.1.0

package/android/src/main/java/com/theoplayer/theolive/THEOliveEventAdapter.kt

@@ -2,6 +2,7 @@ package com.theoplayer.theolive
 
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
+import com.theoplayer.android.api.event.EventListener
 import com.theoplayer.android.api.event.player.theolive.DistributionLoadStartEvent
 import com.theoplayer.android.api.event.player.theolive.DistributionOfflineEvent
 import com.theoplayer.android.api.event.player.theolive.EndpointLoadedEvent
@@ -21,18 +22,30 @@ class THEOliveEventAdapter(private val theoLiveApi: TheoLive, private val emitte
     fun emit(payload: WritableMap?)
   }
 
+  private val onDistributionLoadStart =
+    EventListener<DistributionLoadStartEvent> { onDistributionLoadStart(it) }
+  private val onDistributionOffline =
+    EventListener<DistributionOfflineEvent> { onDistributionOffline(it) }
+  private val onEndPointLoaded =
+    EventListener<EndpointLoadedEvent> { onEndPointLoaded(it) }
+  private val onIntentOfFallback =
+    EventListener<IntentToFallbackEvent> { onIntentOfFallback(it) }
+
   init {
-    theoLiveApi.addEventListener(TheoLiveEventTypes.DISTRIBUTIONLOADSTART, this::onDistributionLoadStart)
-    theoLiveApi.addEventListener(TheoLiveEventTypes.DISTRIBUTIONOFFLINE, this::onDistributionOffline)
-    theoLiveApi.addEventListener(TheoLiveEventTypes.ENDPOINTLOADED, this::onEndPointLoaded)
-    theoLiveApi.addEventListener(TheoLiveEventTypes.INTENTTOFALLBACK, this::onIntentOfFallback)
+    theoLiveApi.addEventListener(TheoLiveEventTypes.DISTRIBUTIONLOADSTART, onDistributionLoadStart)
+    theoLiveApi.addEventListener(TheoLiveEventTypes.DISTRIBUTIONOFFLINE, onDistributionOffline)
+    theoLiveApi.addEventListener(TheoLiveEventTypes.ENDPOINTLOADED, onEndPointLoaded)
+    theoLiveApi.addEventListener(TheoLiveEventTypes.INTENTTOFALLBACK, onIntentOfFallback)
   }
 
   fun destroy() {
-    theoLiveApi.removeEventListener(TheoLiveEventTypes.DISTRIBUTIONLOADSTART, this::onDistributionLoadStart)
-    theoLiveApi.removeEventListener(TheoLiveEventTypes.DISTRIBUTIONOFFLINE, this::onDistributionOffline)
-    theoLiveApi.removeEventListener(TheoLiveEventTypes.ENDPOINTLOADED, this::onEndPointLoaded)
-    theoLiveApi.removeEventListener(TheoLiveEventTypes.INTENTTOFALLBACK, this::onIntentOfFallback)
+    theoLiveApi.removeEventListener(
+      TheoLiveEventTypes.DISTRIBUTIONLOADSTART,
+      onDistributionLoadStart
+    )
+    theoLiveApi.removeEventListener(TheoLiveEventTypes.DISTRIBUTIONOFFLINE, onDistributionOffline)
+    theoLiveApi.removeEventListener(TheoLiveEventTypes.ENDPOINTLOADED, onEndPointLoaded)
+    theoLiveApi.removeEventListener(TheoLiveEventTypes.INTENTTOFALLBACK, onIntentOfFallback)
   }
 
   private fun onDistributionLoadStart(event: DistributionLoadStartEvent) {

package/android/src/main/java/com/theoplayer/theolive/THEOliveModule.kt

@@ -1,22 +1,35 @@
 package com.theoplayer.theolive
 
 import com.facebook.react.bridge.*
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.module.model.ReactModuleInfo
 import com.theoplayer.*
 import com.theoplayer.util.ViewResolver
 
-private const val TAG = "THEORCTTHEOliveModule"
-
 private const val PROP_ENGINE_LATENCY = "engineLatency"
 private const val PROP_DISTRIBUTION_LATENCY = "distributionLatency"
 private const val PROP_PLAYER_LATENCY = "playerLatency"
 private const val PROP_THEOLIVE_LATENCY = "theoliveLatency"
 
 @Suppress("unused")
+@ReactModule(name = THEOliveModule.NAME)
 class THEOliveModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
+  companion object {
+    const val NAME = "THEORCTTHEOliveModule"
+    val INFO = ReactModuleInfo(
+      name = NAME,
+      className = NAME,
+      canOverrideExistingModule = false,
+      needsEagerInit = false,
+      isCxxModule = false,
+      isTurboModule = false,
+    )
+  }
+
   private val viewResolver: ViewResolver = ViewResolver(context)
 
   override fun getName(): String {
-    return TAG
+    return NAME
   }
 
   @ReactMethod

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

@@ -1,6 +1,8 @@
 package com.theoplayer.track
 
 import android.graphics.Color
+import android.graphics.Typeface
+import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.theoplayer.android.api.player.track.texttrack.TextTrackStyle
 
@@ -10,6 +12,7 @@ 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"
+private const val PROP_FONT_PATH = "fontPath"
 private const val PROP_WINDOW_COLOR = "windowColor"
 private const val PROP_MARGIN_LEFT = "marginLeft"
 private const val PROP_MARGIN_RIGHT = "marginRight"
@@ -22,7 +25,7 @@ private const val PROP_COLOR_A = "a"
 
 object TextTrackStyleAdapter {
 
-  fun applyTextTrackStyle(style: TextTrackStyle, props: ReadableMap?) {
+  fun applyTextTrackStyle(style: TextTrackStyle, context: ReactApplicationContext, props: ReadableMap?) {
     if (props == null) {
       return
     }
@@ -65,6 +68,10 @@ object TextTrackStyleAdapter {
     if (props.hasKey(PROP_MARGIN_RIGHT)) {
       style.marginRight = props.getInt(PROP_MARGIN_RIGHT)
     }
+    if (props.hasKey(PROP_FONT_PATH)) {
+      val font = Typeface.createFromAsset(context.assets, props.getString(PROP_FONT_PATH))
+      style.font = font
+    }
   }
 
   private fun edgeStyleFromProps(style: String?): TextTrackStyle.EdgeType {

package/android/src/main/java/com/theoplayer/util/PayloadBuilder.kt

@@ -57,6 +57,9 @@ private const val EVENT_PROP_MUTED = "muted"
 private const val EVENT_PROP_WIDTH = "width"
 private const val EVENT_PROP_HEIGHT = "height"
 
+private const val EVENT_PROP_VIDEO_WIDTH = "videoWidth"
+private const val EVENT_PROP_VIDEO_HEIGHT = "videoHeight"
+
 class PayloadBuilder {
   private val payload: WritableMap = Arguments.createMap()
 
@@ -138,6 +141,11 @@ class PayloadBuilder {
     payload.putInt(EVENT_PROP_WIDTH, width)
     payload.putInt(EVENT_PROP_HEIGHT, height)
   }
+
+  fun videoSize(videoWidth: Int, videoHeight: Int) = apply {
+    payload.putInt(EVENT_PROP_VIDEO_WIDTH, videoWidth)
+    payload.putInt(EVENT_PROP_VIDEO_HEIGHT, videoHeight)
+  }
   fun seekable(ranges: TimeRanges?) = apply {
     payload.putArray(EVENT_PROP_SEEKABLE, fromTimeRanges(ranges))
   }

package/ios/THEOplayerRCTBridge.m

@@ -46,9 +46,11 @@ RCT_EXPORT_VIEW_PROPERTY(onNativeMediaTrackEvent, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativeDeviceOrientationChanged, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativePlayerReady, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativePresentationModeChange, RCTDirectEventBlock);
-RCT_EXPORT_VIEW_PROPERTY(onNativeResize, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onNativeDimensionChange, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onNativeVideoResize, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativeAdEvent, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativeTHEOliveEvent, RCTDirectEventBlock);
+RCT_EXPORT_VIEW_PROPERTY(onNativeTHEOadsEvent, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onNativeCastEvent, RCTDirectEventBlock);
 
 @end
@@ -285,3 +287,21 @@ RCT_EXTERN_METHOD(setAuthToken:(nonnull NSNumber *)node
 
 @end
 
+// ----------------------------------------------------------------------------
+// THEOAds Module
+// ----------------------------------------------------------------------------
+@interface RCT_EXTERN_REMAP_MODULE(THEORCTTHEOAdsModule, THEOplayerRCTTHEOAdsAPI, NSObject)
+
+RCT_EXTERN_METHOD(currentInterstitials:(nonnull NSNumber *)node
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(scheduledInterstitials:(nonnull NSNumber *)node
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(replaceAdTagParameters:(nonnull NSNumber *)node
+                  adTagParameters:(nullable NSDictionary *)adTagParameters)
+
+@end
+

package/ios/THEOplayerRCTDebug.swift

@@ -45,8 +45,11 @@ let DEBUG_CACHE_EVENTS = DEBUG && false
 // Debug flag to monitor cache API usage
 let DEBUG_CACHE_API = DEBUG && false
 
-// Debug flag to monitor theolive API usage
+// Debug flag to monitor THEOLive API usage
 let DEBUG_THEOLIVE_API = DEBUG && false
 
+// Debug flag to monitor THEOAds API usage
+let DEBUG_THEOADS_API = DEBUG && false
+
 // Debug flag to monitor AudioSession interruptions (e.g. phone cll)
 let DEBUG_INTERRUPTIONS = DEBUG && false

package/ios/THEOplayerRCTMainEventHandler.swift

@@ -29,7 +29,8 @@ public class THEOplayerRCTMainEventHandler {
     var onNativeRateChange: RCTDirectEventBlock?
     var onNativeWaiting: RCTDirectEventBlock?
     var onNativeCanPlay: RCTDirectEventBlock?
-    var onNativeResize: RCTDirectEventBlock?
+    var onNativeDimensionChange: RCTDirectEventBlock?
+    var onNativeVideoResize: RCTDirectEventBlock?
     
     // MARK: player Listeners
     private var playListener: EventListener?
@@ -51,11 +52,10 @@ public class THEOplayerRCTMainEventHandler {
     private var rateChangeListener: EventListener?
     private var waitingListener: EventListener?
     private var canPlayListener: EventListener?
-    private var resizeListener: EventListener?
-    private var presentationModeChangeListener: EventListener?
+    private var videoResizeListener: EventListener?
     
     // MARK: player observer
-    private var videoRectObserver: NSKeyValueObservation?
+    private var dimensionChangeObserver: NSKeyValueObservation?
     
     // MARK: - destruction
     func destroy() {
@@ -310,27 +310,27 @@ public class THEOplayerRCTMainEventHandler {
         }
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] CanPlay listener attached to THEOplayer") }
         
-        // RESIZE: TODO on iOS SDK
-        /*self.resizeListener = player.addEventListener(type: PlayerEventTypes.RESIZE) { [weak self, weak player] event in
+        // RESIZE
+        self.videoResizeListener = player.addEventListener(type: PlayerEventTypes.RESIZE) { [weak self, weak player] event in
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Received RESIZE event from THEOplayer") }
             if let wplayer = player,
-               let forwardedResizeEvent = self?.onNativeResize {
-                forwardedResizeEvent(
+               let forwardedVideoResizeEvent = self?.onNativeVideoResize {
+                forwardedVideoResizeEvent(
                     [
-                        "width": wplayer.frame.width,
-                        "height": wplayer.frame.height,
+                        "videoWidth": wplayer.videoWidth,
+                        "videoHeight": wplayer.videoHeight,
                     ]
                 )
             }
         }
-        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Resize listener attached to THEOplayer") }*/
+        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Resize listener attached to THEOplayer") }
         
-        // RESIZE: implemented using videoRect Observation
-        self.videoRectObserver = player.observe(\.videoRect, options: [.new]) { [weak self, weak player] view, change in
+        // DIMENSION CHANGE: implemented using videoRect Observation
+        self.dimensionChangeObserver = player.observe(\.videoRect, options: [.new]) { [weak self, weak player] view, change in
             if DEBUG_THEOPLAYER_EVENTS { PrintUtils.printLog(logText: "[NATIVE] Observed videoRect change on THEOplayer") }
             if let wplayer = player,
-               let forwardedResizeEvent = self?.onNativeResize {
-                forwardedResizeEvent(
+               let forwardedDimensionChangeEvent = self?.onNativeDimensionChange {
+                forwardedDimensionChangeEvent(
                     [
                         "width": wplayer.frame.width,
                         "height": wplayer.frame.height,
@@ -453,12 +453,15 @@ public class THEOplayerRCTMainEventHandler {
             if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] CanPlay listener dettached from THEOplayer") }
         }
         
+        // DIMENSION CHANGE
+        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Invalidate dimensionChangeObserver from THEOplayer") }
+        self.dimensionChangeObserver?.invalidate()
+        self.dimensionChangeObserver = nil
+      
         // RESIZE
-        /*if let resizeListener = self.resizeListener {
-            player.removeEventListener(type: PlayerEventTypes.RESIZE, listener: resizeListener)
-            if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Resize listener dettached from THEOplayer") }
-        }*/
-        self.videoRectObserver?.invalidate()
-        self.videoRectObserver = nil
+        if let videoResizeListener = self.videoResizeListener {
+          player.removeEventListener(type: PlayerEventTypes.RESIZE, listener: videoResizeListener)
+          if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Resize listener dettached from THEOplayer") }
+        }
     }
 }

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -276,7 +276,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Showing textTrack \(uidValue) on TheoPlayer") }
                 for i in 0...textTracks.count-1 {
-                    var textTrack: TextTrack = textTracks.get(i)
+                    let textTrack: TextTrack = textTracks.get(i)
                     if textTrack.uid == uidValue {
                         textTrack.mode = TextTrackMode.showing
                     } else if textTrack.mode == TextTrackMode.showing {
@@ -299,7 +299,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling audioTrack \(uidValue) on TheoPlayer") }
                 for i in 0...audioTracks.count-1 {
-                    var audioTrack: MediaTrack = audioTracks.get(i)
+                    let audioTrack: MediaTrack = audioTracks.get(i)
                     audioTrack.enabled = (audioTrack.uid == uidValue)
                 }
             }
@@ -318,7 +318,7 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                 }
                 if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Enabling videoTrack \(uidValue) on TheoPlayer") }
                 for i in 0...videoTracks.count-1 {
-                    var videoTrack: MediaTrack = videoTracks.get(i)
+                    let videoTrack: MediaTrack = videoTracks.get(i)
                     videoTrack.enabled = (videoTrack.uid == uidValue)
                 }
             }

package/ios/THEOplayerRCTSourceDescriptionBuilder.swift

@@ -162,7 +162,8 @@ class THEOplayerRCTSourceDescriptionBuilder {
         }
       
         // 6. configure CMCD
-        if let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any] {
+        let cmcd = sourceData[SD_PROP_CMCD] as? [String:Any]
+        if cmcd != nil {
           typedSources.forEach { typedSource in
             typedSource.cmcd = true;
           }

package/ios/THEOplayerRCTView.swift

@@ -32,6 +32,7 @@ public class THEOplayerRCTView: UIView {
     var metadataTrackEventHandler: THEOplayerRCTSideloadedMetadataTrackEventHandler
     var adEventHandler: THEOplayerRCTAdsEventHandler
     var theoliveEventHandler: THEOplayerRCTTHEOliveEventHandler
+    var theoadsEventHandler: THEOplayerRCTTHEOadsEventHandler
     var castEventHandler: THEOplayerRCTCastEventHandler
     var presentationModeManager: THEOplayerRCTPresentationModeManager
     var backgroundAudioManager: THEOplayerRCTBackgroundAudioManager
@@ -99,6 +100,7 @@ public class THEOplayerRCTView: UIView {
         self.metadataTrackEventHandler = THEOplayerRCTSideloadedMetadataTrackEventHandler()
         self.adEventHandler = THEOplayerRCTAdsEventHandler()
         self.theoliveEventHandler = THEOplayerRCTTHEOliveEventHandler()
+        self.theoadsEventHandler = THEOplayerRCTTHEOadsEventHandler()
         self.castEventHandler = THEOplayerRCTCastEventHandler()
         self.presentationModeManager = THEOplayerRCTPresentationModeManager()
         self.backgroundAudioManager = THEOplayerRCTBackgroundAudioManager()
@@ -121,6 +123,7 @@ public class THEOplayerRCTView: UIView {
         self.deviceEventHandler.destroy()
         self.adEventHandler.destroy()
         self.theoliveEventHandler.destroy()
+        self.theoadsEventHandler.destroy()
         self.castEventHandler.destroy()
         self.nowPlayingManager.destroy()
         self.remoteCommandsManager.destroy()
@@ -156,6 +159,7 @@ public class THEOplayerRCTView: UIView {
             self.mediaTrackEventHandler.setPlayer(player)
             self.adEventHandler.setPlayer(player)
             self.theoliveEventHandler.setPlayer(player)
+            self.theoadsEventHandler.setPlayer(player)
             self.castEventHandler.setPlayer(player)
             self.nowPlayingManager.setPlayer(player)
             self.remoteCommandsManager.setPlayer(player)
@@ -354,10 +358,16 @@ public class THEOplayerRCTView: UIView {
         if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeCanPlay prop set.") }
     }
     
-    @objc(setOnNativeResize:)
-    func setOnNativeResize(nativeResize: @escaping RCTDirectEventBlock) {
-        self.mainEventHandler.onNativeResize = nativeResize
-        if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeResize prop set.") }
+    @objc(setOnNativeDimensionChange:)
+    func setOnNativeDimensionChange(nativeDimensionChange: @escaping RCTDirectEventBlock) {
+        self.mainEventHandler.onNativeDimensionChange = nativeDimensionChange
+        if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeDimensionChange prop set.") }
+    }
+  
+    @objc(setOnNativeVideoResize:)
+    func setOnNativeVideoResize(nativeVideoResize: @escaping RCTDirectEventBlock) {
+        self.mainEventHandler.onNativeVideoResize = nativeVideoResize
+        if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeVideoResize prop set.") }
     }
     
     // MARK: - Listener based PRESENTATIONMODE event bridging
@@ -427,4 +437,12 @@ public class THEOplayerRCTView: UIView {
         self.theoliveEventHandler.onNativeTHEOliveEvent = nativeTHEOliveEvent
         if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeTHEOliveEvent prop set.") }
     }
+    
+    // MARK: - Listener based THEOADS event bridging
+    
+    @objc(setOnNativeTHEOadsEvent:)
+    func setOnNativeTHEOadsEvent(nativeTHEOadsEvent: @escaping RCTDirectEventBlock) {
+        self.theoadsEventHandler.onNativeTHEOadsEvent = nativeTHEOadsEvent
+        if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeTHEOadsEvent prop set.") }
+    }
 }